YUKI Hiroshi
null+****@clear*****
Fri Jul 11 12:55:04 JST 2014
YUKI Hiroshi 2014-07-11 12:55:04 +0900 (Fri, 11 Jul 2014) New Revision: 027197de19dc5439f8f5f4e0326a128253f0b1b8 https://github.com/droonga/droonga.org/commit/027197de19dc5439f8f5f4e0326a128253f0b1b8 Message: Update translated versions Modified files: _po/ja/tutorial/1.0.5/add-replica/index.po _po/ja/tutorial/1.0.5/basic/index.po _po/ja/tutorial/1.0.5/dump-restore/index.po _po/ja/tutorial/1.0.5/groonga/index.po ja/tutorial/1.0.5/add-replica/index.md ja/tutorial/1.0.5/basic/index.md ja/tutorial/1.0.5/dump-restore/index.md ja/tutorial/1.0.5/groonga/index.md Modified: _po/ja/tutorial/1.0.5/add-replica/index.po (+4 -6) =================================================================== --- _po/ja/tutorial/1.0.5/add-replica/index.po 2014-07-11 12:53:38 +0900 (57137d9) +++ _po/ja/tutorial/1.0.5/add-replica/index.po 2014-07-11 12:55:04 +0900 (f358ce5) @@ -164,7 +164,7 @@ msgstr "" msgid "" " (on 192.168.0.12)\n" -" # kill $(cat $PWD/droonga-engine.pid)\n" +" # kill $(cat ~/droonga/droonga-engine.pid)\n" " # rm -rf ~/droonga\n" " # mkdir ~/droonga\n" " # scp 192.168.0.10:~/droonga/catalog.json ~/droonga/" @@ -175,9 +175,8 @@ msgstr "では、サーバを起動しましょう。" msgid "" " (on 192.168.0.12)\n" -" # cd ~/droonga\n" " # host=192.168.0.12\n" -" # DROONGA_BASE_DIR=$PWD\n" +" # export DROONGA_BASE_DIR=$HOME/droonga\n" " # droonga-engine --host=$host \\\n" " --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" " --daemon \\\n" @@ -490,10 +489,9 @@ msgstr "" msgid "" " (on 192.168.0.12)\n" -" # cd ~/droonga\n" -" # scp 192.168.0.10:~/droonga/catalog.json ./\n" +" # scp 192.168.0.10:~/droonga/catalog.json ~/droonga/\n" " # host=192.168.0.12\n" -" # DROONGA_BASE_DIR=$PWD\n" +" # export DROONGA_BASE_DIR=$HOME/droonga\n" " # droonga-engine --host=$host \\\n" " --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" " --daemon \\\n" Modified: _po/ja/tutorial/1.0.5/basic/index.po (+13 -424) =================================================================== --- _po/ja/tutorial/1.0.5/basic/index.po 2014-07-11 12:53:38 +0900 (027353a) +++ _po/ja/tutorial/1.0.5/basic/index.po 2014-07-11 12:55:04 +0900 (93be51b) @@ -378,11 +378,11 @@ msgid "" msgstr "以下のようにして droonga-engine を起動します。" msgid "" -" # base_path=$PWD\n" +" # export DROONGA_BASE_DIR=$PWD\n" " # droonga-engine --host 192.168.0.10 \\\n" -" --log-file=$base_path/droonga-engine.log \\\n" +" --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file $base_path/droonga-engine.pid" +" --pid-file $DROONGA_BASE_DIR/droonga-engine.pid" msgstr "" msgid "### Stop an instance of droonga-engine" @@ -394,7 +394,7 @@ msgstr "最初にdroonga-engineを終了する方法を知っておきましょ msgid "Send SIGTERM to droonga-engine:" msgstr "droonga-engineにSIGTERMを送ります。" -msgid " # kill $(cat droonga-engine.pid)" +msgid " # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)" msgstr "" msgid "This is the way to stop droonga-engine." @@ -403,6 +403,13 @@ msgstr "これがdroonga-engineを終了する方法です。" msgid "Start droonga-engine again:" msgstr "再度droonga-engineを起動します。" +msgid "" +" # droonga-engine --host 192.168.0.10 \\\n" +" --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" +" --daemon \\\n" +" --pid-file $DROONGA_BASE_DIR/droonga-engine.pid" +msgstr "" + msgid "### Create a database" msgstr "### データベースを作成する" @@ -881,424 +888,7 @@ msgid "" " \"body\": true\n" " }\n" "]\n" -"Elapsed time: 0.008872597\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9034681\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.008392207\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9126666\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.011983187\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9212565\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.008101728\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9338331\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.004175044\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9421282\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.017018749\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.946642\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.007583209\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9639654\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.00841723\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9719582\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.009108127\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9804838\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.005036642\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.989766\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.004036806\n" -"[\n" -" \"droonga.message\",\n" -" 1393562553,\n" -" {\n" -" \"inReplyTo\": \"1393562553.9952037\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.012368974\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562553.999501\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.004099008\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.0122097\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.027017019\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.016705\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.010383751\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.044215\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.004364288\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.0549927\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.003277611\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.0595262\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.007540272\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.063036\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.002973611\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.0707917\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.024142012\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.0739512\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.010329014\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.098288\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.004758853\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.1089437\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.007113416\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.113922\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.007472331\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.121428\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.011560447\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.1294332\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.006053761\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.1413999\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.013611626\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.1479707\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.007455591\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.1624238\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.005440424\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.1702914\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.005610303\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.1760805\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.025479938\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.1822054\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.007125251\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.2080746\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.009454133\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.2158518\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.003632905\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.2255347\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.003653783\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.2293708\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.003643588\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.2332237\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.003703875\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.237225\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" -"Elapsed time: 0.003402826\n" -"[\n" -" \"droonga.message\",\n" -" 1393562554,\n" -" {\n" -" \"inReplyTo\": \"1393562554.2411628\",\n" -" \"statusCode\": 200,\n" -" \"type\": \"add.result\",\n" -" \"body\": true\n" -" }\n" -"]\n" +"...\n" "Elapsed time: 0.004817463\n" "[\n" " \"droonga.message\",\n" @@ -1525,11 +1115,10 @@ 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 $base_path/droonga-http-server.pid" +" --pid-file $DROONGA_BASE_DIR/droonga-http-server.pid" msgstr "" msgid "### Search request via HTTP" Modified: _po/ja/tutorial/1.0.5/dump-restore/index.po (+9 -9) =================================================================== --- _po/ja/tutorial/1.0.5/dump-restore/index.po 2014-07-11 12:53:38 +0900 (e18a0e8) +++ _po/ja/tutorial/1.0.5/dump-restore/index.po 2014-07-11 12:55:04 +0900 (62c2bc1) @@ -242,10 +242,10 @@ msgstr "もし順番にこのチュートリアルを読み進めているので msgid "" " (on 192.168.0.10)\n" -" # cd ~/droonga\n" -" # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)\n" -" # rm -r 000\n" " # host=192.168.0.10\n" +" # export DROONGA_BASE_DIR=$HOME/droonga\n" +" # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)\n" +" # rm -r $DROONGA_BASE_DIR/000\n" " # droonga-engine --host=$host \\\n" " --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" " --daemon \\\n" @@ -254,10 +254,10 @@ msgstr "" msgid "" " (on 192.168.0.11)\n" -" # cd ~/droonga\n" -" # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)\n" -" # rm -r 000\n" " # host=192.168.0.11\n" +" # export DROONGA_BASE_DIR=$HOME/droonga\n" +" # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)\n" +" # rm -r $DROONGA_BASE_DIR/000\n" " # droonga-engine --host=$host \\\n" " --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" " --daemon \\\n" @@ -393,10 +393,10 @@ msgstr "" msgid "" " (on 192.168.0.11)\n" -" # cd ~/droonga\n" -" # kill $(cat $PWD/droonga-engine.pid)\n" -" # rm -r 000\n" " # host=192.168.0.11\n" +" # export DROONGA_BASE_DIR=$HOME/droonga\n" +" # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)\n" +" # rm -r $DROONGA_BASE_DIR/000\n" " # droonga-engine-catalog-modify --source=$PWD/catalog.json \\\n" " --update \\\n" " --replica-hosts=$host\n" Modified: _po/ja/tutorial/1.0.5/groonga/index.po (+2 -3) =================================================================== --- _po/ja/tutorial/1.0.5/groonga/index.po 2014-07-11 12:53:38 +0900 (8a3fe7e) +++ _po/ja/tutorial/1.0.5/groonga/index.po 2014-07-11 12:55:04 +0900 (333e7bc) @@ -244,9 +244,8 @@ msgid "To start them, run commands like following on each Droonga node:" msgstr "サービスを起動するには、各Droongaノードで以下のようにコマンドを実行します：" msgid "" -" # cd ~/droonga\n" " # host=192.168.0.10\n" -" # DROONGA_BASE_DIR=$PWD\n" +" # export DROONGA_BASE_DIR=$HOME/droonga\n" " # droonga-engine --host=$host \\\n" " --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" " --daemon \\\n" @@ -272,8 +271,8 @@ msgstr "" "よって、別のDroongaノード上では以下のように別のホスト名を指定する事になります：" msgid "" -" # cd ~/droonga\n" " # host=192.168.0.11\n" +" # export DROONGA_BASE_DIR=$HOME/droonga\n" " # droonga-engine --host=$host \\\n" " ..." msgstr "" Modified: ja/tutorial/1.0.5/add-replica/index.md (+4 -6) =================================================================== --- ja/tutorial/1.0.5/add-replica/index.md 2014-07-11 12:53:38 +0900 (d5f164d) +++ ja/tutorial/1.0.5/add-replica/index.md 2014-07-11 12:55:04 +0900 (63e8bb5) @@ -79,7 +79,7 @@ Droongaのノードの集合には、「replica」と「slice」という2つの もしそのコンピュータがかつてDroongaノードとして使われていた事があった場合には、最初に古いデータを消去する必要があります。 (on 192.168.0.12) - # kill $(cat $PWD/droonga-engine.pid) + # kill $(cat ~/droonga/droonga-engine.pid) # rm -rf ~/droonga # mkdir ~/droonga # scp 192.168.0.10:~/droonga/catalog.json ~/droonga/ @@ -87,9 +87,8 @@ Droongaのノードの集合には、「replica」と「slice」という2つの では、サーバを起動しましょう。 (on 192.168.0.12) - # cd ~/droonga # host=192.168.0.12 - # DROONGA_BASE_DIR=$PWD + # export DROONGA_BASE_DIR=$HOME/droonga # droonga-engine --host=$host \ --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ @@ -304,10 +303,9 @@ Droongaクラスタ内のノードは互いに監視しあっており、動作 必要なパッケージをインストールし、クラスタの既存のノードから `catalog.json` をコピーして、サーバを起動します。 (on 192.168.0.12) - # cd ~/droonga - # scp 192.168.0.10:~/droonga/catalog.json ./ + # scp 192.168.0.10:~/droonga/catalog.json ~/droonga/ # host=192.168.0.12 - # DROONGA_BASE_DIR=$PWD + # export DROONGA_BASE_DIR=$HOME/droonga # droonga-engine --host=$host \ --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ Modified: ja/tutorial/1.0.5/basic/index.md (+8 -427) =================================================================== --- ja/tutorial/1.0.5/basic/index.md 2014-07-11 12:53:38 +0900 (037425f) +++ ja/tutorial/1.0.5/basic/index.md 2014-07-11 12:55:04 +0900 (74a6aa1) @@ -222,11 +222,11 @@ catalog.json: 以下のようにして droonga-engine を起動します。 - # base_path=$PWD + # export DROONGA_BASE_DIR=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$base_path/droonga-engine.log \ + --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ - --pid-file $base_path/droonga-engine.pid + --pid-file $DROONGA_BASE_DIR/droonga-engine.pid ### droonga-engine を終了する @@ -234,17 +234,16 @@ catalog.json: droonga-engineにSIGTERMを送ります。 - # kill $(cat droonga-engine.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) これがdroonga-engineを終了する方法です。 再度droonga-engineを起動します。 - # base_path=$PWD # droonga-engine --host 192.168.0.10 \ - --log-file=$base_path/droonga-engine.log \ + --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ - --pid-file $base_path/droonga-engine.pid + --pid-file $DROONGA_BASE_DIR/droonga-engine.pid ### データベースを作成する @@ -713,424 +712,7 @@ Elapsed time: 0.01101195 "body": true } ] -Elapsed time: 0.008872597 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9034681", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.008392207 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9126666", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.011983187 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9212565", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.008101728 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9338331", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.004175044 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9421282", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.017018749 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.946642", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.007583209 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9639654", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.00841723 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9719582", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.009108127 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9804838", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.005036642 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.989766", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.004036806 -[ - "droonga.message", - 1393562553, - { - "inReplyTo": "1393562553.9952037", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.012368974 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562553.999501", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.004099008 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.0122097", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.027017019 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.016705", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.010383751 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.044215", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.004364288 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.0549927", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.003277611 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.0595262", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.007540272 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.063036", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.002973611 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.0707917", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.024142012 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.0739512", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.010329014 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.098288", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.004758853 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.1089437", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.007113416 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.113922", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.007472331 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.121428", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.011560447 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.1294332", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.006053761 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.1413999", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.013611626 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.1479707", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.007455591 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.1624238", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.005440424 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.1702914", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.005610303 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.1760805", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.025479938 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.1822054", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.007125251 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.2080746", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.009454133 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.2158518", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.003632905 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.2255347", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.003653783 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.2293708", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.003643588 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.2332237", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.003703875 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.237225", - "statusCode": 200, - "type": "add.result", - "body": true - } -] -Elapsed time: 0.003402826 -[ - "droonga.message", - 1393562554, - { - "inReplyTo": "1393562554.2411628", - "statusCode": 200, - "type": "add.result", - "body": true - } -] +... Elapsed time: 0.004817463 [ "droonga.message", @@ -1332,11 +914,10 @@ 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 $base_path/droonga-http-server.pid + --pid-file $DROONGA_BASE_DIR/droonga-http-server.pid ### HTTPでの検索リクエスト Modified: ja/tutorial/1.0.5/dump-restore/index.md (+9 -9) =================================================================== --- ja/tutorial/1.0.5/dump-restore/index.md 2014-07-11 12:53:38 +0900 (8899d79) +++ ja/tutorial/1.0.5/dump-restore/index.md 2014-07-11 12:55:04 +0900 (7b698d8) @@ -148,20 +148,20 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong もし順番にこのチュートリアルを読み進めているのであれば、クラスタとダンプファイルが既に手元にあるはずです。以下の操作でクラスタを空にしましょう: (on 192.168.0.10) - # cd ~/droonga - # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) - # rm -r 000 # host=192.168.0.10 + # export DROONGA_BASE_DIR=$HOME/droonga + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) + # rm -r $DROONGA_BASE_DIR/000 # droonga-engine --host=$host \ --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid (on 192.168.0.11) - # cd ~/droonga - # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) - # rm -r 000 # host=192.168.0.11 + # export DROONGA_BASE_DIR=$HOME/droonga + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) + # rm -r $DROONGA_BASE_DIR/000 # droonga-engine --host=$host \ --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ @@ -244,10 +244,10 @@ Elapsed time: 0.008678467 --replica-hosts=$host (on 192.168.0.11) - # cd ~/droonga - # kill $(cat $PWD/droonga-engine.pid) - # rm -r 000 # host=192.168.0.11 + # export DROONGA_BASE_DIR=$HOME/droonga + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) + # rm -r $DROONGA_BASE_DIR/000 # droonga-engine-catalog-modify --source=$PWD/catalog.json \ --update \ --replica-hosts=$host Modified: ja/tutorial/1.0.5/groonga/index.md (+2 -3) =================================================================== --- ja/tutorial/1.0.5/groonga/index.md 2014-07-11 12:53:38 +0900 (f1216c0) +++ ja/tutorial/1.0.5/groonga/index.md 2014-07-11 12:55:04 +0900 (6a8a084) @@ -116,9 +116,8 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ サービスを起動するには、各Droongaノードで以下のようにコマンドを実行します： - # cd ~/droonga # host=192.168.0.10 - # DROONGA_BASE_DIR=$PWD + # export DROONGA_BASE_DIR=$HOME/droonga # droonga-engine --host=$host \ --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ @@ -135,8 +134,8 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ この情報は、クラスタ内の他のDroongaノードとの通信のために使われます。 よって、別のDroongaノード上では以下のように別のホスト名を指定する事になります： - # cd ~/droonga # host=192.168.0.11 + # export DROONGA_BASE_DIR=$HOME/droonga # droonga-engine --host=$host \ ... -------------- next part -------------- HTML����������������������������...Download