Kouhei Sutou
null+****@clear*****
Thu Aug 22 18:05:01 JST 2013
Kouhei Sutou 2013-08-22 18:05:01 +0900 (Thu, 22 Aug 2013) New Revision: 4b14789467438ef87eea58eb1474249e7f1b49d5 https://github.com/groonga/groonga/commit/4b14789467438ef87eea58eb1474249e7f1b49d5 Message: init: unified timeout value variable name to TIMEOUT NOTE: It is a backward incompatibility change. groonga-server-http: COMMAND_TIMEOUT -> TIMEOUT groonga-httpd: STATUS_TIMEOUT -> TIMEOUT groonga-httpd-restart: STATUS_TIMEOUT -> TIMEOUT Modified files: data/init.d/redhat/groonga-server-http data/init.d/redhat/sysconfig/groonga-httpd data/init.d/redhat/sysconfig/groonga-server-http data/scripts/groonga-httpd-restart packages/debian/groonga-httpd.default packages/debian/groonga-httpd.init packages/debian/groonga-server-http.default packages/debian/groonga-server-http.init Modified: data/init.d/redhat/groonga-server-http (+2 -2) =================================================================== --- data/init.d/redhat/groonga-server-http 2013-08-22 17:50:26 +0900 (3f7a424) +++ data/init.d/redhat/groonga-server-http 2013-08-22 18:05:01 +0900 (baf5efd) @@ -35,7 +35,7 @@ LOG_PATH=/var/log/groonga/groonga-http.log QUERY_LOG_PATH=/var/log/groonga/query-http.log OPTION_ARGS="" GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE=/usr/share/groonga/synonyms.tsv -COMMAND_TIMEOUT=5 +TIMEOUT=5 if [ -f /etc/sysconfig/$name ]; then . /etc/sysconfig/$name @@ -110,7 +110,7 @@ RETVAL=0 send_command() { command=$1 - $curl --max-time $COMMAND_TIMEOUT "http://${ADDRESS}:${PORT}/d/${command}" + $curl --max-time $TIMEOUT "http://${ADDRESS}:${PORT}/d/${command}" } start() { Modified: data/init.d/redhat/sysconfig/groonga-httpd (+1 -1) =================================================================== --- data/init.d/redhat/sysconfig/groonga-httpd 2013-08-22 17:50:26 +0900 (696e5c8) +++ data/init.d/redhat/sysconfig/groonga-httpd 2013-08-22 18:05:01 +0900 (e1a5150) @@ -7,4 +7,4 @@ #LOG_PATH=/var/log/groonga/httpd/access.log #QUERY_LOG_PATH=/var/log/groonga/httpd/access.log #GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE=/usr/share/groonga/synonyms.tsv -STATUS_TIMEOUT=3 +TIMEOUT=3 Modified: data/init.d/redhat/sysconfig/groonga-server-http (+1 -1) =================================================================== --- data/init.d/redhat/sysconfig/groonga-server-http 2013-08-22 17:50:26 +0900 (dbca329) +++ data/init.d/redhat/sysconfig/groonga-server-http 2013-08-22 18:05:01 +0900 (cf33c00) @@ -8,4 +8,4 @@ #QUERY_LOG_PATH=/var/log/groonga/query-http.log #PROTOCOL=http #GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE=/usr/share/groonga/synonyms.tsv -#COMMAND_TIMEOUT=5 +#TIMEOUT=5 Modified: data/scripts/groonga-httpd-restart (+2 -2) =================================================================== --- data/scripts/groonga-httpd-restart 2013-08-22 17:50:26 +0900 (4821f3c) +++ data/scripts/groonga-httpd-restart 2013-08-22 18:05:01 +0900 (3d71cb3) @@ -21,7 +21,7 @@ SERVICE_NAME=groonga-httpd GROONGA_HTTPD=${SERVICE_NAME} PID_FILE=/var/run/groonga/${GROONGA_HTTPD}.pid OLD_PID_FILE=${PID_FILE}.oldbin -STATUS_TIMEOUT=3 +TIMEOUT=3 # Source configuration. if [ -f /etc/default/${SERVICE_NAME} ]; then @@ -31,7 +31,7 @@ elif [ -f /etc/sysconfig/${SERVICE_NAME} ]; then fi wait_until () { - local rest=${STATUS_TIMEOUT} + local rest=${TIMEOUT} local duration=1 while [ ${rest} -ge 0 ]; do if "$@"; then Modified: packages/debian/groonga-httpd.default (+1 -1) =================================================================== --- packages/debian/groonga-httpd.default 2013-08-22 17:50:26 +0900 (366f562) +++ packages/debian/groonga-httpd.default 2013-08-22 18:05:01 +0900 (71e3dbe) @@ -8,6 +8,6 @@ #QUERY_LOG_PATH=/var/log/groonga/query.log #PROTOCOL=http #GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE=/usr/share/groonga/synonyms.tsv -STATUS_TIMEOUT=3 +TIMEOUT=3 # Comment out this to disable groonga-httpd daemon. ENABLE=yes Modified: packages/debian/groonga-httpd.init (+1 -1) =================================================================== --- packages/debian/groonga-httpd.init 2013-08-22 17:50:26 +0900 (f8814b0) +++ packages/debian/groonga-httpd.init 2013-08-22 18:05:01 +0900 (9f1197f) @@ -69,7 +69,7 @@ send_command() { command=$1 if [ "$command" = "status" ]; then - $CURL --max-time $STATUS_TIMEOUT "http://${ADDRESS}:${PORT}/d/${command}" + $CURL --max-time $TIMEOUT "http://${ADDRESS}:${PORT}/d/${command}" else $CURL "http://${ADDRESS}:${PORT}/d/${command}" fi Modified: packages/debian/groonga-server-http.default (+1 -1) =================================================================== --- packages/debian/groonga-server-http.default 2013-08-22 17:50:26 +0900 (ea06057) +++ packages/debian/groonga-server-http.default 2013-08-22 18:05:01 +0900 (79ec763) @@ -8,7 +8,7 @@ #QUERY_LOG_PATH=/var/log/groonga/query-http.log #PROTOCOL=http #GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE=/usr/share/groonga/synonyms.tsv -#COMMAND_TIMEOUT=5 +#TIMEOUT=5 # Comment out this to disable groonga daemon. ENABLE=yes Modified: packages/debian/groonga-server-http.init (+2 -2) =================================================================== --- packages/debian/groonga-server-http.init 2013-08-22 17:50:26 +0900 (4305aaa) +++ packages/debian/groonga-server-http.init 2013-08-22 18:05:01 +0900 (0bac3c9) @@ -31,7 +31,7 @@ PIDFILE=/var/run/groonga/$NAME-$PROTOCOL.pid SCRIPTNAME=/etc/init.d/$NAME-server-$PROTOCOL OPTION_ARGS="" START_STOP_DAEMON_ARGS="" -COMMAND_TIMEOUT=5 +TIMEOUT=5 ENABLE="no" DEFAULT_FILE=/etc/default/groonga-server-http @@ -107,7 +107,7 @@ send_command() { command=$1 if [ "${PROTOCOL}" = "http" ]; then - $CURL --max-time $COMMAND_TIMEOUT "http://${ADDRESS}:${PORT}/d/${command}" + $CURL --max-time $TIMEOUT "http://${ADDRESS}:${PORT}/d/${command}" else $DAEMON --port ${PORT} -c ${ADDRESS} ${command} fi -------------- next part -------------- HTML����������������������������...Download
