Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202679
Change subject: Added default init-scripts, changed name to graphoid
......................................................................
Added default init-scripts, changed name to graphoid
Change-Id: I120bc16617d9ef79106cd1d0478f1d6ed935d23c
---
A dist/init-scripts/graphoid
A dist/init-scripts/graphoid.conf
A dist/init-scripts/graphoid.service
M package.json
4 files changed, 222 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/graphoid
refs/changes/79/202679/1
diff --git a/dist/init-scripts/graphoid b/dist/init-scripts/graphoid
new file mode 100644
index 0000000..cd62e6b
--- /dev/null
+++ b/dist/init-scripts/graphoid
@@ -0,0 +1,172 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: graphoid
+# Required-Start: $local_fs $network $remote_fs $syslog
+# Required-Stop: $local_fs $network $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: renders vega graphs from mediawiki pages
+# Description: graphoid - renders vega graphs from mediawiki pages
+### END INIT INFO
+
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="graphoid service"
+NAME=graphoid
+SCRIPT_PATH=/srv/deployment/$NAME/deploy/src/server.js
+DAEMON="/usr/bin/nodejs $SCRIPT_PATH"
+DAEMON_ARGS="-c /etc/$NAME/config.yaml"
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -e "$SCRIPT_PATH" ] || exit 0
+
+# Read configuration variable file if it is present
+# NOTE: only the DAEMON_ARGS var should be set in the file if present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# export some variables into the process' environment
+export PORT
+export INTERFACE
+export NODE_PATH=/srv/deployment/$NAME/deploy/node_modules
+export GRAPHOID_PORT=6927
+
+
+# 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()
+{
+ # up the number of fds [sockets] from 1024
+ ulimit -n 10000
+
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -bm \
+ -c $NAME:$NAME --test \
+ --exec /bin/sh -- \
+ -c "$DAEMON $DAEMON_ARGS 2>&1 | logger -i -t $NAME" \
+ || return 1
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -bm \
+ -c graphoid:graphoid \
+ --exec /bin/sh -- \
+ -c "$DAEMON $DAEMON_ARGS 2>&1 | logger -i -t $NAME" \
+ || return 2
+ echo "Started graphoid service on port 6927"
+
+
+ # 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.
+ sleep 5
+}
+
+#
+# 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/60/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/5/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|status|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
diff --git a/dist/init-scripts/graphoid.conf b/dist/init-scripts/graphoid.conf
new file mode 100644
index 0000000..8ce5a20
--- /dev/null
+++ b/dist/init-scripts/graphoid.conf
@@ -0,0 +1,24 @@
+# Upstart job for graphoid
+
+description "graphoid - renders vega graphs from mediawiki pages"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+
+# up ulimit -n a bit
+limit nofile 10000 10000
+
+setuid "graphoid"
+setgid "graphoid"
+
+env NODE_PATH="/srv/deployment/graphoid/deploy/node_modules"
+env GRAPHOID_PORT="6927"
+
+respawn
+
+# wait 60 seconds for a graceful restart before killing the master
+kill timeout 60
+
+chdir /srv/deployment/graphoid/deploy
+exec /usr/bin/nodejs src/server.js -c /etc/graphoid/config.yaml >>
/var/log/graphoid/main.log 2>&1
+
diff --git a/dist/init-scripts/graphoid.service
b/dist/init-scripts/graphoid.service
new file mode 100644
index 0000000..4efda55
--- /dev/null
+++ b/dist/init-scripts/graphoid.service
@@ -0,0 +1,25 @@
+[Unit]
+Description=graphoid - renders vega graphs from mediawiki pages
+Documentation=https://www.mediawiki.org/wiki/Extension:Graph
+After=network.target local-fs.target
+
+[Service]
+Type=simple
+LimitNOFILE=10000
+PIDFile=%t/graphoid.pid
+User=graphoid
+Group=graphoid
+WorkingDirectory=/srv/deployment/graphoid/deploy
+Environment="NODE_PATH='/srv/deployment/graphoid/deploy/node_modules'"
"GRAPHOID_PORT=6927"
+ExecStart=/usr/bin/nodejs src/server.js -c /etc/graphoid/config.yaml
+Restart=always
+RestartSec=5
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=graphoid
+TimeoutStartSec=5
+TimeoutStopSec=60
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/package.json b/package.json
index ba57194..bbd3a0e 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "Graphoid",
+ "name": "graphoid",
"version": "0.1.0",
"description": "renders vega graphs from mediawiki pages",
"main": "./app.js",
--
To view, visit https://gerrit.wikimedia.org/r/202679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I120bc16617d9ef79106cd1d0478f1d6ed935d23c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
