Kouhei Sutou
null+****@clear*****
Fri Sep 5 17:06:53 JST 2014
Kouhei Sutou 2014-09-05 17:06:53 +0900 (Fri, 05 Sep 2014) New Revision: a17f726a40ca28dbe5346d5f87fba9ba45c8245c https://github.com/groonga/groonga/commit/a17f726a40ca28dbe5346d5f87fba9ba45c8245c Message: rpm: use nginx style init script Don't control via HTTP. Use signal. Modified files: data/init.d/redhat/groonga-httpd data/init.d/redhat/sysconfig/groonga-httpd Modified: data/init.d/redhat/groonga-httpd (+14 -66) =================================================================== --- data/init.d/redhat/groonga-httpd 2014-09-05 10:08:48 +0900 (abd0de3) +++ data/init.d/redhat/groonga-httpd 2014-09-05 17:06:53 +0900 (0589e5d) @@ -14,85 +14,29 @@ # Required-Start: $remote_fs # Required-Stop: $remote_fs # Short-Description: groonga-httpd's init script -# Description: groonga-httpd is a HTTP server for groonga. +# Description: groonga-httpd is a HTTP server for Groonga. ### END INIT INFO # Source function library. -. /etc/init.d/functions +. /etc/rc.d/init.d/functions name="groonga-httpd" prog="groonga-httpd" GROONGA_HTTPD=/usr/sbin/$prog GROONGA_HTTPD_RESTART=/usr/sbin/$prog-restart -CURL=/usr/bin/curl -USER=groonga -GROUP=groonga -DATABASE=/var/lib/groonga/db/db -ADDRESS=127.0.0.1 -PORT=10041 -PIDFILE=/var/run/groonga/$prog.pid -OLD_PIDFILE=$PIDFILE.oldbin -PROTOCOL=http -ERROR_LOG_PATH=/var/log/groonga/httpd/error.log -QUERY_LOG_PATH=/var/log/groonga/httpd/access.log -OPTION_ARGS="" -TIMEOUT=3 -GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE=/usr/share/groonga/synonyms.tsv +GROONGA_HTTPD_ARGS="" if [ -f /etc/sysconfig/$name ]; then . /etc/sysconfig/$name fi DAEMON_ARGS="" -GROONGA_ARGS="" - -if [ -n "${USER}" ]; then - if ! getent passwd | grep -q "^${USER}:"; then - echo "$0: user for running $prog doesn't exist: ${USER}" >&2 - exit 1 - fi - if [ -n "${PIDFILE}" ]; then - mkdir -p `dirname ${PIDFILE}` - chown -R ${USER} `dirname ${PIDFILE}` - fi -fi - -if [ -n "${PIDFILE}" ]; then - mkdir -p $(dirname ${PIDFILE}) - if [ -n "${USER}" ]; then - chown -R ${USER} $(dirname ${PIDFILE}) - fi -fi - -if [ -z "${DATABASE}" ]; then - echo "$0: DATABASE should not be empty" >&2 - exit 1 -fi - -if [ ! -f "${DATABASE}" ]; then - mkdir -p $(dirname ${DATABASE}) - if [ -n "${USER}" ]; then - chown -R ${USER} $(dirname ${DATABASE}) - fi - if [ -n "${GROUP}" ]; then - chgrp -R ${GROUP} $(dirname ${DATABASE}) - fi -fi RETVAL=0 -send_command() { - command=$1 - if [ "$command" = "status" ]; then - $CURL --max-time $TIMEOUT "http://${ADDRESS}:${PORT}/d/${command}" - else - $CURL "http://${ADDRESS}:${PORT}/d/${command}" - fi -} - start() { echo -n "Starting $name: " - daemon $DAEMON_ARGS ${GROONGA_HTTPD} "$GROONGA_ARGS" + daemon $DAEMON_ARGS ${GROONGA_HTTPD} ${GROONGA_HTTPD_ARGS} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog @@ -101,7 +45,6 @@ start() { stop() { echo -n "Shutting down $name: " - send_command shutdown ${GROONGA_HTTPD} -s stop RETVAL=$? echo @@ -109,8 +52,13 @@ stop() { return $RETVAL } -status() { - send_command status +restart() { + echo -n "Restarting $name: " + ${GROONGA_HTTPD_RESTART} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog + return $RETVAL } case "$1" in @@ -122,19 +70,19 @@ case "$1" in ;; restart) if [ -f /var/lock/subsys/$prog ]; then - ${GROONGA_HTTPD_RESTART} + restart else start fi ;; reload) - killproc $groonga -HUP + ${GROONGA_HTTPD} -s reload ;; condrestart) [ -f /var/lock/subsys/$prog ] && restart || : ;; status) - status + status $prog ;; *) echo "Usage: $prog {start|stop|reload|restart|condrestart|status}" Modified: data/init.d/redhat/sysconfig/groonga-httpd (+1 -9) =================================================================== --- data/init.d/redhat/sysconfig/groonga-httpd 2014-09-05 10:08:48 +0900 (e1a5150) +++ data/init.d/redhat/sysconfig/groonga-httpd 2014-09-05 17:06:53 +0900 (1af2fca) @@ -1,10 +1,2 @@ # Default -#USER=groonga -#GROUP=groonga -#ADDRESS=127.0.0.1 -#PORT=10041 -#DATABASE=/var/lib/groonga/db/db -#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 -TIMEOUT=3 +# GROONGA_HTTPD_ARGS="" -------------- next part -------------- HTML����������������������������...Download