From 25a134d1339bc7693ca96c0d46f64ff9ca52c61b Mon Sep 17 00:00:00 2001 From: tfarina Date: Fri, 17 Oct 2014 07:36:36 -0700 Subject: webtry: Add logserver to serve /tmp/glog. This setup and runs a logserver, like the one being used by skiaperf, to serve the directory /tmp/glog, so we don't need to ssh into the instance to see the logs of the webtry application. This is a follow up to suggestion made in codereview.chromium.org/655323002. BUG=None R=jcgregorio@google.com Review URL: https://codereview.chromium.org/643903003 --- experimental/webtry/setup/continue_install.sh | 1 + experimental/webtry/setup/sys/logserver_init | 159 ++++++++++++++++++++++++++ experimental/webtry/setup/sys/webtry_monit | 4 + experimental/webtry/setup/webtry_setup.sh | 3 + 4 files changed, 167 insertions(+) create mode 100644 experimental/webtry/setup/sys/logserver_init diff --git a/experimental/webtry/setup/continue_install.sh b/experimental/webtry/setup/continue_install.sh index 069b63fffb..ff4238668f 100755 --- a/experimental/webtry/setup/continue_install.sh +++ b/experimental/webtry/setup/continue_install.sh @@ -40,5 +40,6 @@ git checkout master cd experimental/webtry +go get -u skia.googlesource.com/buildbot.git/perf/go/logserver go get -d ./build diff --git a/experimental/webtry/setup/sys/logserver_init b/experimental/webtry/setup/sys/logserver_init new file mode 100644 index 0000000000..84a8a371b2 --- /dev/null +++ b/experimental/webtry/setup/sys/logserver_init @@ -0,0 +1,159 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: logserver +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start logserver. +# Description: Serves the log file directory via HTTP. +### END INIT INFO + +# Author: Joe Gregorio +# +# Copied from /etc/init.d/skeleton and modified only the following +# environment variables and updated the start-stop-daemon calls +# in do_start() to add --make-pidfile, --background, and --chuid. + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="The Skia WebTry log server application." +NAME=logserver +DAEMON=/home/webtry/golib/bin/$NAME +DAEMON_ARGS="--log_dir=/tmp/glog" +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.2-14) to ensure that this file is present +# and status_of_proc is working. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON --make-pidfile --background --chuid webtry --test > /dev/null \ + || return 1 + start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON --make-pidfile --background --chuid webtry --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/experimental/webtry/setup/sys/webtry_monit b/experimental/webtry/setup/sys/webtry_monit index 906b0a69ac..35cf5d34dd 100644 --- a/experimental/webtry/setup/sys/webtry_monit +++ b/experimental/webtry/setup/sys/webtry_monit @@ -2,6 +2,10 @@ check process webtry with pidfile /var/run/webtry.pid start program = "/etc/init.d/webtry start" stop program = "/etc/init.d/webtry stop" +check process logserver with pidfile /var/run/logserver.pid + start program = "/etc/init.d/logserver start" + stop program = "/etc/init.d/logserver stop" + check process squid3 with pidfile /var/run/squid3.pid start program = "/etc/init.d/squid3 start" stop program = "/etc/init.d/squid3 stop" diff --git a/experimental/webtry/setup/webtry_setup.sh b/experimental/webtry/setup/webtry_setup.sh index bcc33975f4..382c2aa95f 100755 --- a/experimental/webtry/setup/webtry_setup.sh +++ b/experimental/webtry/setup/webtry_setup.sh @@ -69,9 +69,11 @@ sudo su - webtry -c /home/webtry/continue_install.sh banner "Setting up system initialization scripts" sudo cp sys/webtry_init /etc/init.d/webtry +sudo cp sys/logserver_init /etc/init.d/logserver sudo cp sys/webtry_monit /etc/monit/conf.d/webtry sudo cp sys/webtry_squid /etc/squid3/squid.conf sudo chmod 744 /etc/init.d/webtry +sudo chmod 744 /etc/init.d/logserver # Confirm that monit is happy. sudo monit -t @@ -80,5 +82,6 @@ sudo monit reload banner "Restarting webtry server" sudo /etc/init.d/webtry restart +sudo /etc/init.d/logserver restart banner "All done!" -- cgit v1.2.3