YUKI Hiroshi
null+****@clear*****
Thu May 29 15:16:30 JST 2014
YUKI Hiroshi 2014-05-29 15:16:30 +0900 (Thu, 29 May 2014) New Revision: e9a3fd47e7a8edba6bb767e029b2acefb8b01995 https://github.com/droonga/droonga.org/commit/e9a3fd47e7a8edba6bb767e029b2acefb8b01995 Message: Don't specify PWD directly. Because it doesn't work expectedly for droonga-engine... Modified files: _po/ja/tutorial/1.0.3/basic/index.po _po/ja/tutorial/1.0.3/groonga/index.po _po/ja/tutorial/1.0.4/basic/index.po _po/ja/tutorial/1.0.4/groonga/index.po ja/tutorial/1.0.3/basic/index.md ja/tutorial/1.0.3/groonga/index.md ja/tutorial/1.0.4/basic/index.md ja/tutorial/1.0.4/groonga/index.md tutorial/1.0.3/basic/index.md tutorial/1.0.3/groonga/index.md tutorial/1.0.4/basic/index.md tutorial/1.0.4/groonga/index.md Modified: _po/ja/tutorial/1.0.3/basic/index.po (+5 -3) =================================================================== --- _po/ja/tutorial/1.0.3/basic/index.po 2014-05-29 14:19:56 +0900 (d7fac5c) +++ _po/ja/tutorial/1.0.3/basic/index.po 2014-05-29 15:16:30 +0900 (733ad71) @@ -378,10 +378,11 @@ msgid "" msgstr "以下のようにして droonga-engine を起動します。" msgid "" +" # base_path=$PWD\n" " # droonga-engine --host 192.168.0.10 \\\n" -" --log-file=$PWD/droonga-engine.log \\\n" +" --log-file=$base_path/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file $PWD/droonga-engine.pid" +" --pid-file $base_path/droonga-engine.pid" msgstr "" msgid "### Stop an instance of droonga-engine" @@ -1524,10 +1525,11 @@ msgid "Then, run it." msgstr "次に、サーバを起動します。" msgid "" +" # base_path=$PWD\n" " # droonga-http-server --receive-host-name=192.168.0.10 \\\n" " --droonga-engine-host-name=192.168.0.10 \\\n" " --daemon \\\n" -" --pid-file $PWD/droonga-http-server.pid" +" --pid-file $base_path/droonga-http-server.pid" msgstr "" msgid "### Search request via HTTP" Modified: _po/ja/tutorial/1.0.3/groonga/index.po (+8 -2) =================================================================== --- _po/ja/tutorial/1.0.3/groonga/index.po 2014-05-29 14:19:56 +0900 (3bf522c) +++ _po/ja/tutorial/1.0.3/groonga/index.po 2014-05-29 15:16:30 +0900 (1960b3d) @@ -246,14 +246,20 @@ msgstr "サービスを起動するには、各Droongaノードで以下のよ msgid "" " # cd ~/droonga\n" " # host=192.168.0.10\n" +" # base_path=$PWD\n" " # droonga-engine --host=$host \\\n" +" --log-file=$base_path/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=$PWD/droonga-engine.pid\n" +" --pid-file=$base_path/droonga-engine.pid\n" " # droonga-http-server --port=10041 \\\n" " --receive-host-name=$host \\\n" " --droonga-engine-host-name=$host \\\n" +" --access-log-file=$base_path/droonga-http-server.acc" +"ess.log \\\n" +" --system-log-file=$base_path/droonga-http-server.sys" +"tem.log \\\n" " --daemon \\\n" -" --pid-file=$PWD/droonga-http-server.pid" +" --pid-file=$base_path/droonga-http-server.pid" msgstr "" msgid "" Modified: _po/ja/tutorial/1.0.4/basic/index.po (+5 -3) =================================================================== --- _po/ja/tutorial/1.0.4/basic/index.po 2014-05-29 14:19:56 +0900 (d7fac5c) +++ _po/ja/tutorial/1.0.4/basic/index.po 2014-05-29 15:16:30 +0900 (733ad71) @@ -378,10 +378,11 @@ msgid "" msgstr "以下のようにして droonga-engine を起動します。" msgid "" +" # base_path=$PWD\n" " # droonga-engine --host 192.168.0.10 \\\n" -" --log-file=$PWD/droonga-engine.log \\\n" +" --log-file=$base_path/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file $PWD/droonga-engine.pid" +" --pid-file $base_path/droonga-engine.pid" msgstr "" msgid "### Stop an instance of droonga-engine" @@ -1524,10 +1525,11 @@ msgid "Then, run it." msgstr "次に、サーバを起動します。" msgid "" +" # base_path=$PWD\n" " # droonga-http-server --receive-host-name=192.168.0.10 \\\n" " --droonga-engine-host-name=192.168.0.10 \\\n" " --daemon \\\n" -" --pid-file $PWD/droonga-http-server.pid" +" --pid-file $base_path/droonga-http-server.pid" msgstr "" msgid "### Search request via HTTP" Modified: _po/ja/tutorial/1.0.4/groonga/index.po (+8 -2) =================================================================== --- _po/ja/tutorial/1.0.4/groonga/index.po 2014-05-29 14:19:56 +0900 (3bf522c) +++ _po/ja/tutorial/1.0.4/groonga/index.po 2014-05-29 15:16:30 +0900 (1960b3d) @@ -246,14 +246,20 @@ msgstr "サービスを起動するには、各Droongaノードで以下のよ msgid "" " # cd ~/droonga\n" " # host=192.168.0.10\n" +" # base_path=$PWD\n" " # droonga-engine --host=$host \\\n" +" --log-file=$base_path/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=$PWD/droonga-engine.pid\n" +" --pid-file=$base_path/droonga-engine.pid\n" " # droonga-http-server --port=10041 \\\n" " --receive-host-name=$host \\\n" " --droonga-engine-host-name=$host \\\n" +" --access-log-file=$base_path/droonga-http-server.acc" +"ess.log \\\n" +" --system-log-file=$base_path/droonga-http-server.sys" +"tem.log \\\n" " --daemon \\\n" -" --pid-file=$PWD/droonga-http-server.pid" +" --pid-file=$base_path/droonga-http-server.pid" msgstr "" msgid "" Modified: ja/tutorial/1.0.3/basic/index.md (+8 -5) =================================================================== --- ja/tutorial/1.0.3/basic/index.md 2014-05-29 14:19:56 +0900 (9b9e53f) +++ ja/tutorial/1.0.3/basic/index.md 2014-05-29 15:16:30 +0900 (09ffa30) @@ -222,10 +222,11 @@ catalog.json: 以下のようにして droonga-engine を起動します。 + # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file $PWD/droonga-engine.pid + --pid-file $base_path/droonga-engine.pid ### droonga-engine を終了する @@ -239,10 +240,11 @@ droonga-engineにSIGTERMを送ります。 再度droonga-engineを起動します。 + # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file $PWD/droonga-engine.pid + --pid-file $base_path/droonga-engine.pid ### データベースを作成する @@ -1330,10 +1332,11 @@ HTTP Protocol Adapterとして`droonga-http-server`を使用します。`droonga 次に、サーバを起動します。 + # base_path=$PWD # droonga-http-server --receive-host-name=192.168.0.10 \ --droonga-engine-host-name=192.168.0.10 \ --daemon \ - --pid-file $PWD/droonga-http-server.pid + --pid-file $base_path/droonga-http-server.pid ### HTTPでの検索リクエスト Modified: ja/tutorial/1.0.3/groonga/index.md (+6 -2) =================================================================== --- ja/tutorial/1.0.3/groonga/index.md 2014-05-29 14:19:56 +0900 (eb929e3) +++ ja/tutorial/1.0.3/groonga/index.md 2014-05-29 15:16:30 +0900 (36282d2) @@ -118,14 +118,18 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ # cd ~/droonga # host=192.168.0.10 + # base_path=$PWD # droonga-engine --host=$host \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file=$PWD/droonga-engine.pid + --pid-file=$base_path/droonga-engine.pid # droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ + --access-log-file=$base_path/droonga-http-server.access.log \ + --system-log-file=$base_path/droonga-http-server.system.log \ --daemon \ - --pid-file=$PWD/droonga-http-server.pid + --pid-file=$base_path/droonga-http-server.pid いくつかのオプションにおいて、そのDroongaノード自身のホスト名を指定する必要がある事に注意して下さい。 この情報は、クラスタ内の他のDroongaノードとの通信のために使われます。 Modified: ja/tutorial/1.0.4/basic/index.md (+8 -5) =================================================================== --- ja/tutorial/1.0.4/basic/index.md 2014-05-29 14:19:56 +0900 (2382191) +++ ja/tutorial/1.0.4/basic/index.md 2014-05-29 15:16:30 +0900 (67ea45a) @@ -222,10 +222,11 @@ catalog.json: 以下のようにして droonga-engine を起動します。 + # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file $PWD/droonga-engine.pid + --pid-file $base_path/droonga-engine.pid ### droonga-engine を終了する @@ -239,10 +240,11 @@ droonga-engineにSIGTERMを送ります。 再度droonga-engineを起動します。 + # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file $PWD/droonga-engine.pid + --pid-file $base_path/droonga-engine.pid ### データベースを作成する @@ -1330,10 +1332,11 @@ HTTP Protocol Adapterとして`droonga-http-server`を使用します。`droonga 次に、サーバを起動します。 + # base_path=$PWD # droonga-http-server --receive-host-name=192.168.0.10 \ --droonga-engine-host-name=192.168.0.10 \ --daemon \ - --pid-file $PWD/droonga-http-server.pid + --pid-file $base_path/droonga-http-server.pid ### HTTPでの検索リクエスト Modified: ja/tutorial/1.0.4/groonga/index.md (+6 -2) =================================================================== --- ja/tutorial/1.0.4/groonga/index.md 2014-05-29 14:19:56 +0900 (b4a29eb) +++ ja/tutorial/1.0.4/groonga/index.md 2014-05-29 15:16:30 +0900 (0af6349) @@ -118,14 +118,18 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ # cd ~/droonga # host=192.168.0.10 + # base_path=$PWD # droonga-engine --host=$host \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file=$PWD/droonga-engine.pid + --pid-file=$base_path/droonga-engine.pid # droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ + --access-log-file=$base_path/droonga-http-server.access.log \ + --system-log-file=$base_path/droonga-http-server.system.log \ --daemon \ - --pid-file=$PWD/droonga-http-server.pid + --pid-file=$base_path/droonga-http-server.pid いくつかのオプションにおいて、そのDroongaノード自身のホスト名を指定する必要がある事に注意して下さい。 この情報は、クラスタ内の他のDroongaノードとの通信のために使われます。 Modified: tutorial/1.0.3/basic/index.md (+8 -5) =================================================================== --- tutorial/1.0.3/basic/index.md 2014-05-29 14:19:56 +0900 (cc72b32) +++ tutorial/1.0.3/basic/index.md 2014-05-29 15:16:30 +0900 (6f95b99) @@ -214,10 +214,11 @@ For more details of the configuration file `catalog.json`, see [the reference ma Start a Droonga engine, you can start it with the command `droonga-engine`, like: + # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file $PWD/droonga-engine.pid + --pid-file $base_path/droonga-engine.pid ### Stop an instance of droonga-engine @@ -231,10 +232,11 @@ This is the way to stop droonga-engine. Start droonga-engine again: + # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file $PWD/droonga-engine.pid + --pid-file $base_path/droonga-engine.pid ### Create a database @@ -1323,10 +1325,11 @@ Let's use the `droonga-http-server` as an HTTP protocol adapter. It is an npm pa Then, run it. + # base_path=$PWD # droonga-http-server --receive-host-name=192.168.0.10 \ --droonga-engine-host-name=192.168.0.10 \ --daemon \ - --pid-file $PWD/droonga-http-server.pid + --pid-file $base_path/droonga-http-server.pid ### Search request via HTTP Modified: tutorial/1.0.3/groonga/index.md (+6 -2) =================================================================== --- tutorial/1.0.3/groonga/index.md 2014-05-29 14:19:56 +0900 (45d1d44) +++ tutorial/1.0.3/groonga/index.md 2014-05-29 15:16:30 +0900 (d70e990) @@ -109,14 +109,18 @@ To start them, run commands like following on each Droonga node: # cd ~/droonga # host=192.168.0.10 + # base_path=$PWD # droonga-engine --host=$host \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file=$PWD/droonga-engine.pid + --pid-file=$base_path/droonga-engine.pid # droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ + --access-log-file=$base_path/droonga-http-server.access.log \ + --system-log-file=$base_path/droonga-http-server.system.log \ --daemon \ - --pid-file=$PWD/droonga-http-server.pid + --pid-file=$base_path/droonga-http-server.pid Note that you have to specify the host name of the Droonga node itself via some options. It will be used to communicate with other Droonga nodes in the cluster. Modified: tutorial/1.0.4/basic/index.md (+8 -5) =================================================================== --- tutorial/1.0.4/basic/index.md 2014-05-29 14:19:56 +0900 (cc72b32) +++ tutorial/1.0.4/basic/index.md 2014-05-29 15:16:30 +0900 (6f95b99) @@ -214,10 +214,11 @@ For more details of the configuration file `catalog.json`, see [the reference ma Start a Droonga engine, you can start it with the command `droonga-engine`, like: + # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file $PWD/droonga-engine.pid + --pid-file $base_path/droonga-engine.pid ### Stop an instance of droonga-engine @@ -231,10 +232,11 @@ This is the way to stop droonga-engine. Start droonga-engine again: + # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file $PWD/droonga-engine.pid + --pid-file $base_path/droonga-engine.pid ### Create a database @@ -1323,10 +1325,11 @@ Let's use the `droonga-http-server` as an HTTP protocol adapter. It is an npm pa Then, run it. + # base_path=$PWD # droonga-http-server --receive-host-name=192.168.0.10 \ --droonga-engine-host-name=192.168.0.10 \ --daemon \ - --pid-file $PWD/droonga-http-server.pid + --pid-file $base_path/droonga-http-server.pid ### Search request via HTTP Modified: tutorial/1.0.4/groonga/index.md (+6 -2) =================================================================== --- tutorial/1.0.4/groonga/index.md 2014-05-29 14:19:56 +0900 (45d1d44) +++ tutorial/1.0.4/groonga/index.md 2014-05-29 15:16:30 +0900 (d70e990) @@ -109,14 +109,18 @@ To start them, run commands like following on each Droonga node: # cd ~/droonga # host=192.168.0.10 + # base_path=$PWD # droonga-engine --host=$host \ + --log-file=$base_path/droonga-engine.log \ --daemon \ - --pid-file=$PWD/droonga-engine.pid + --pid-file=$base_path/droonga-engine.pid # droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ + --access-log-file=$base_path/droonga-http-server.access.log \ + --system-log-file=$base_path/droonga-http-server.system.log \ --daemon \ - --pid-file=$PWD/droonga-http-server.pid + --pid-file=$base_path/droonga-http-server.pid Note that you have to specify the host name of the Droonga node itself via some options. It will be used to communicate with other Droonga nodes in the cluster. -------------- next part -------------- HTML����������������������������...Download