YUKI Hiroshi
null+****@clear*****
Thu May 29 21:12:30 JST 2014
YUKI Hiroshi 2014-05-29 21:12:30 +0900 (Thu, 29 May 2014) New Revision: 4c048f933e9a3513a76e23aaf8e30691eb9b76c0 https://github.com/droonga/droonga.org/commit/4c048f933e9a3513a76e23aaf8e30691eb9b76c0 Message: Use absolute path Modified files: _po/ja/tutorial/1.0.3/dump-restore/index.po _po/ja/tutorial/1.0.3/groonga/index.po _po/ja/tutorial/1.0.4/dump-restore/index.po _po/ja/tutorial/1.0.4/groonga/index.po ja/tutorial/1.0.3/dump-restore/index.md ja/tutorial/1.0.3/groonga/index.md ja/tutorial/1.0.4/dump-restore/index.md ja/tutorial/1.0.4/groonga/index.md tutorial/1.0.3/dump-restore/index.md tutorial/1.0.3/groonga/index.md tutorial/1.0.4/dump-restore/index.md tutorial/1.0.4/groonga/index.md Modified: _po/ja/tutorial/1.0.3/dump-restore/index.po (+16 -13) =================================================================== --- _po/ja/tutorial/1.0.3/dump-restore/index.po 2014-05-29 20:53:22 +0900 (5fecf15) +++ _po/ja/tutorial/1.0.3/dump-restore/index.po 2014-05-29 21:12:30 +0900 (bf618b0) @@ -241,24 +241,26 @@ msgstr "もし順番にこのチュートリアルを読み進めているので msgid "" " (on 192.168.0.10)\n" -" # kill $(cat ~/droonga/droonga-engine.pid)\n" -" # rm -r ~/droonga/000\n" +" # cd ~/droonga\n" +" # kill $(cat $PWD/droonga-engine.pid)\n" +" # rm -r 000\n" " # host=192.168.0.10\n" " # droonga-engine --host=$host \\\n" -" --log-file=~/droonga/droonga-engine.log \\\n" +" --log-file=$PWD/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid" +" --pid-file=$PWD/droonga-engine.pid" msgstr "" msgid "" " (on 192.168.0.11)\n" -" # kill $(cat ~/droonga/droonga-engine.pid)\n" -" # rm -r ~/droonga/000\n" +" # cd ~/droonga\n" +" # kill $(cat $PWD/droonga-engine.pid)\n" +" # rm -r 000\n" " # host=192.168.0.11\n" " # droonga-engine --host=$host \\\n" -" --log-file=~/droonga/droonga-engine.log \\\n" +" --log-file=$PWD/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid" +" --pid-file=$PWD/droonga-engine.pid" msgstr "" msgid "After that the cluster becomes empty. Confirm it:" @@ -398,15 +400,16 @@ msgstr "" msgid "" " (on 192.168.0.11)\n" -" # kill $(cat ~/droonga/droonga-engine.pid)\n" -" # rm -r ~/droonga/000\n" +" # cd ~/droonga\n" +" # kill $(cat $PWD/droonga-engine.pid)\n" +" # rm -r 000\n" " # host=192.168.0.11\n" " # droonga-engine-catalog-generate --hosts=$host \\\n" -" --output=~/droonga/catalog.json\n" +" --output=$PWD/catalog.json\n" " # droonga-engine --host=$host \\\n" -" --log-file=~/droonga/droonga-engine.log \\\n" +" --log-file=$PWD/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid" +" --pid-file=$PWD/droonga-engine.pid" msgstr "" msgid "" Modified: _po/ja/tutorial/1.0.3/groonga/index.po (+3 -3) =================================================================== --- _po/ja/tutorial/1.0.3/groonga/index.po 2014-05-29 20:53:22 +0900 (22933d7) +++ _po/ja/tutorial/1.0.3/groonga/index.po 2014-05-29 21:12:30 +0900 (e8eaa2b) @@ -247,16 +247,16 @@ msgid "" " # cd ~/droonga\n" " # host=192.168.0.10\n" " # droonga-engine --host=$host \\\n" -" --log-file=~/droonga/droonga-engine.log \\\n" +" --log-file=$PWD/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid\n" +" --pid-file=$PWD/droonga-engine.pid\n" " # env NODE_ENV=production \\\n" " droonga-http-server --port=10041 \\\n" " --receive-host-name=$host \\\n" " --droonga-engine-host-name=$host \\\n" " --cache-size=-1 \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-http-server.pid" +" --pid-file=$PWD/droonga-http-server.pid" msgstr "" msgid "" Modified: _po/ja/tutorial/1.0.4/dump-restore/index.po (+16 -14) =================================================================== --- _po/ja/tutorial/1.0.4/dump-restore/index.po 2014-05-29 20:53:22 +0900 (ed4dfb4) +++ _po/ja/tutorial/1.0.4/dump-restore/index.po 2014-05-29 21:12:30 +0900 (878aae9) @@ -241,24 +241,26 @@ msgstr "もし順番にこのチュートリアルを読み進めているので msgid "" " (on 192.168.0.10)\n" -" # kill $(cat ~/droonga/droonga-engine.pid)\n" -" # rm -r ~/droonga/000\n" +" # cd ~/droonga\n" +" # kill $(cat $PWD/droonga-engine.pid)\n" +" # rm -r 000\n" " # host=192.168.0.10\n" " # droonga-engine --host=$host \\\n" -" --log-file=~/droonga/droonga-engine.log \\\n" +" --log-file=$PWD/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid" +" --pid-file=$PWD/droonga-engine.pid" msgstr "" msgid "" " (on 192.168.0.11)\n" -" # kill $(cat ~/droonga/droonga-engine.pid)\n" -" # rm -r ~/droonga/000\n" +" # cd ~/droonga\n" +" # kill $(cat $PWD/droonga-engine.pid)\n" +" # rm -r 000\n" " # host=192.168.0.11\n" " # droonga-engine --host=$host \\\n" -" --log-file=~/droonga/droonga-engine.log \\\n" +" --log-file=$PWD/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid" +" --pid-file=$PWD/droonga-engine.pid" msgstr "" msgid "After that the cluster becomes empty. Confirm it:" @@ -398,16 +400,16 @@ msgstr "" msgid "" " (on 192.168.0.11)\n" -" # kill $(cat ~/droonga/droonga-engine.pid)\n" -" # rm -r ~/droonga/000\n" +" # cd ~/droonga\n" +" # kill $(cat $PWD/droonga-engine.pid)\n" +" # rm -r 000\n" " # host=192.168.0.11\n" " # droonga-engine-catalog-generate --hosts=$host \\\n" -" --output=~/droonga/catalog.json\n" -" # cd ~/droonga\n" +" --output=$PWD/catalog.json\n" " # droonga-engine --host=$host \\\n" -" --log-file=~/droonga/droonga-engine.log \\\n" +" --log-file=$PWD/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid" +" --pid-file=$PWD/droonga-engine.pid" msgstr "" msgid "" Modified: _po/ja/tutorial/1.0.4/groonga/index.po (+3 -3) =================================================================== --- _po/ja/tutorial/1.0.4/groonga/index.po 2014-05-29 20:53:22 +0900 (22b31bb) +++ _po/ja/tutorial/1.0.4/groonga/index.po 2014-05-29 21:12:30 +0900 (43c44ef) @@ -247,16 +247,16 @@ msgid "" " # cd ~/droonga\n" " # host=192.168.0.10\n" " # droonga-engine --host=$host \\\n" -" --log-file=~/droonga/droonga-engine.log \\\n" +" --log-file=$PWD/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid\n" +" --pid-file=$PWD/droonga-engine.pid\n" " # env NODE_ENV=production \\\n" " droonga-http-server --port=10041 \\\n" " --receive-host-name=$host \\\n" " --droonga-engine-host-name=$host \\\n" " --cache-size=-1 \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-http-server.pid" +" --pid-file=$PWD/droonga-http-server.pid" msgstr "" msgid "" Modified: ja/tutorial/1.0.3/dump-restore/index.md (+16 -13) =================================================================== --- ja/tutorial/1.0.3/dump-restore/index.md 2014-05-29 20:53:22 +0900 (bd4ced2) +++ ja/tutorial/1.0.3/dump-restore/index.md 2014-05-29 21:12:30 +0900 (9ea85ae) @@ -148,22 +148,24 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong もし順番にこのチュートリアルを読み進めているのであれば、クラスタとダンプファイルが既に手元にあるはずです。以下の操作でクラスタを空にしましょう: (on 192.168.0.10) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.11 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid これでクラスタは空になりました。確かめてみましょう: @@ -245,15 +247,16 @@ Elapsed time: 0.008678467 --output=~/droonga/catalog.json (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.11 # droonga-engine-catalog-generate --hosts=$host \ - --output=~/droonga/catalog.json + --output=$PWD/catalog.json # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid これで、ノード `192.168.0.10` を含む複製元クラスタと、ノード `192.168.0.11` を含む複製先の空のクラスタの、2つのクラスタができました。確かめてみましょう: Modified: ja/tutorial/1.0.3/groonga/index.md (+3 -3) =================================================================== --- ja/tutorial/1.0.3/groonga/index.md 2014-05-29 20:53:22 +0900 (b11d0f6) +++ ja/tutorial/1.0.3/groonga/index.md 2014-05-29 21:12:30 +0900 (121f8a4) @@ -119,16 +119,16 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ # cd ~/droonga # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid # env NODE_ENV=production \ droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ --cache-size=-1 \ --daemon \ - --pid-file=~/droonga/droonga-http-server.pid + --pid-file=$PWD/droonga-http-server.pid いくつかのオプションにおいて、そのDroongaノード自身のホスト名を指定する必要がある事に注意して下さい。 この情報は、クラスタ内の他のDroongaノードとの通信のために使われます。 Modified: ja/tutorial/1.0.4/dump-restore/index.md (+16 -14) =================================================================== --- ja/tutorial/1.0.4/dump-restore/index.md 2014-05-29 20:53:22 +0900 (6f51418) +++ ja/tutorial/1.0.4/dump-restore/index.md 2014-05-29 21:12:30 +0900 (d2f8848) @@ -148,22 +148,24 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong もし順番にこのチュートリアルを読み進めているのであれば、クラスタとダンプファイルが既に手元にあるはずです。以下の操作でクラスタを空にしましょう: (on 192.168.0.10) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.11 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid これでクラスタは空になりました。確かめてみましょう: @@ -244,16 +246,16 @@ Elapsed time: 0.008678467 --output=~/droonga/catalog.json (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.11 # droonga-engine-catalog-generate --hosts=$host \ - --output=~/droonga/catalog.json - # cd ~/droonga + --output=$PWD/catalog.json # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid これで、ノード `192.168.0.10` を含む複製元クラスタと、ノード `192.168.0.11` を含む複製先の空のクラスタの、2つのクラスタができました。確かめてみましょう: Modified: ja/tutorial/1.0.4/groonga/index.md (+3 -3) =================================================================== --- ja/tutorial/1.0.4/groonga/index.md 2014-05-29 20:53:22 +0900 (acc77ee) +++ ja/tutorial/1.0.4/groonga/index.md 2014-05-29 21:12:30 +0900 (8974997) @@ -119,16 +119,16 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ # cd ~/droonga # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid # env NODE_ENV=production \ droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ --cache-size=-1 \ --daemon \ - --pid-file=~/droonga/droonga-http-server.pid + --pid-file=$PWD/droonga-http-server.pid いくつかのオプションにおいて、そのDroongaノード自身のホスト名を指定する必要がある事に注意して下さい。 この情報は、クラスタ内の他のDroongaノードとの通信のために使われます。 Modified: tutorial/1.0.3/dump-restore/index.md (+16 -13) =================================================================== --- tutorial/1.0.3/dump-restore/index.md 2014-05-29 20:53:22 +0900 (6b72900) +++ tutorial/1.0.3/dump-restore/index.md 2014-05-29 21:12:30 +0900 (be3ad4d) @@ -141,22 +141,24 @@ If you are reading this tutorial sequentially, you'll have an existing cluster a Make it empty with these commands: (on 192.168.0.10) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.11 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid After that the cluster becomes empty. Confirm it: @@ -239,15 +241,16 @@ Construct two clusters and make one empty, with these commands: --output=~/droonga/catalog.json (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.11 # droonga-engine-catalog-generate --hosts=$host \ - --output=~/droonga/catalog.json + --output=$PWD/catalog.json # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid After that there are two clusters: one contains `192.168.0.10` with data, another contains `192.168.0.11` with no data. Confirm it: Modified: tutorial/1.0.3/groonga/index.md (+3 -3) =================================================================== --- tutorial/1.0.3/groonga/index.md 2014-05-29 20:53:22 +0900 (b869b8b) +++ tutorial/1.0.3/groonga/index.md 2014-05-29 21:12:30 +0900 (aee2431) @@ -110,16 +110,16 @@ To start them, run commands like following on each Droonga node: # cd ~/droonga # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid # env NODE_ENV=production \ droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ --cache-size=-1 \ --daemon \ - --pid-file=~/droonga/droonga-http-server.pid + --pid-file=$PWD/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/dump-restore/index.md (+16 -14) =================================================================== --- tutorial/1.0.4/dump-restore/index.md 2014-05-29 20:53:22 +0900 (3a88427) +++ tutorial/1.0.4/dump-restore/index.md 2014-05-29 21:12:30 +0900 (8eb1a2e) @@ -141,22 +141,24 @@ If you are reading this tutorial sequentially, you'll have an existing cluster a Make it empty with these commands: (on 192.168.0.10) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.11 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid After that the cluster becomes empty. Confirm it: @@ -238,16 +240,16 @@ Construct two clusters and make one empty, with these commands: --output=~/droonga/catalog.json (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-engine.pid) - # rm -r ~/droonga/000 + # cd ~/droonga + # kill $(cat $PWD/droonga-engine.pid) + # rm -r 000 # host=192.168.0.11 # droonga-engine-catalog-generate --hosts=$host \ - --output=~/droonga/catalog.json - # cd ~/droonga + --output=$PWD/catalog.json # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid After that there are two clusters: one contains `192.168.0.10` with data, another contains `192.168.0.11` with no data. Confirm it: Modified: tutorial/1.0.4/groonga/index.md (+3 -3) =================================================================== --- tutorial/1.0.4/groonga/index.md 2014-05-29 20:53:22 +0900 (7ce3b6a) +++ tutorial/1.0.4/groonga/index.md 2014-05-29 21:12:30 +0900 (897daa5) @@ -110,16 +110,16 @@ To start them, run commands like following on each Droonga node: # cd ~/droonga # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=~/droonga/droonga-engine.log \ + --log-file=$PWD/droonga-engine.log \ --daemon \ - --pid-file=~/droonga/droonga-engine.pid + --pid-file=$PWD/droonga-engine.pid # env NODE_ENV=production \ droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ --cache-size=-1 \ --daemon \ - --pid-file=~/droonga/droonga-http-server.pid + --pid-file=$PWD/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����������������������������...ダウンロード
