Merge branch 'bodhi-space-master'

README.md

@@ -92,13 +92,13 @@ vagrant up
 
 ## Custom Nodejs Environment
 
-Use the `$environment` parameter to add custom environment variables or run scripts in the `/etc/default/statsd` file.  For example, you could enable Redhat's software collections and add a custom path like so:
+Use the `$env_append` parameter to add custom environment variables or run scripts in the `/etc/default/statsd` file.  For example, you could enable Redhat's software collections and add a custom path like so:
 
 ```
 class { 'statsd':
   backends     => ['./backends/graphite'],
   graphiteHost => 'localhost',
-  environment  => [
+  env_append   => [
     'source /opt/rh/nodejs010/enable',
     'PATH=/opt/my/path:$PATH',
   ],

files/statsd-init-rhel

@@ -11,73 +11,152 @@ NAME="statsd"
 DAEMON="/usr/local/sbin/statsd"
 pidfile=/var/run/statsd.pid
 lockfile=/var/lock/subsys/statsd
-RETVAL=0
 STOP_TIMEOUT=${STOP_TIMEOUT-10}
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-# Determine if we can use the -p option to daemon, killproc, and status.
-# RHEL < 5 can't.
-if status | grep -q -- '-p' 2>/dev/null; then
-    daemonopts="--pidfile $pidfile"
-    pidopts="-p $pidfile"
-fi
+# /etc/default/${NAME} is the Debian location.  Add the following for anyone
+# expecting this to be consistent with a Red Hat layout.
+[ -r /etc/sysconfig/${NAME} ] && . /etc/sysconfig/${NAME}
+
+eval "$( declare -f status | sed -e 's/\<status[[:space:]]()/orig_status()/' )"
+
+daemonopts="--pidfile $pidfile"
+pidopts="-p $pidfile"
 
+status() {
+    orig_status -p ${pidfile} ${NAME}
+}
+
 start() {
-  echo -n $"Starting $NAME: "
-  # See if it's already running. Look *only* at the pid file.
-  if [ -f ${pidfile} ]; then
-    failure "PID file exists for statsd"
-    RETVAL=1
-  else
+  local ret_val=0
+  status &>/dev/null || ret_val=${?}
+  case ${ret_val} in
+  0)
+    # Daemon is already running.
+    echo -n $'daemon is already running'
+    success
+    echo
+    ;;
+  1)
+    # Daemon is not running, but pidfile exists.
+    echo -n $'Clearing stale pidfile, '
+    rm -f ${pidfile} ${lockfile} &>/dev/null || true
+    start || ret_val=${?}
+    ;;
+  *)
+    # The status command returns 3 for the correct state (daemon is stopped
+    # and there is no pidfile).  Go ahead and try to start even if we get
+    # something other than 3.
+
+    echo -n $"Starting $NAME: "
+
     # Run as process
     $DAEMON ${STATSJS} ${STATSD_CONFIG} ${STATSD_LOGFILE} &
-    RETVAL=$?
-    # Store PID
-    echo $! > ${pidfile}
-
-    # Success
-    [ $RETVAL = 0 ] && success "statsd started"
-  fi
-
-  echo
-  return $RETVAL
+    ret_val=$?
+    if [ ${ret_val} == 0 ] ; then
+      # Store PID *only* when we have a successful startup *and* don't
+      # do this if the application is already writing the file via the
+      # pidopts setting.
+      #[ -n ${pidopts+set} ] || echo ${!} > ${pidfile}
+      echo ${!} > ${pidfile}
+      echo -n $'started'
+      success 
+    else
+      echo -n $'could not be started'
+      failure
+    fi
+    echo
+    ;;
+  esac
+
+  return ${ret_val}
 }
 
 stop() {
+  local ret_val=0
+
   echo -n $"Stopping $NAME: "
   killproc -p ${pidfile}
-  RETVAL=$?
+  ret_val=$?
+  if [ ${ret_val} == 0 ] ; then
+    rm -f ${pidfile} ${lockfile} &>/dev/null || true
+    echo -n $"stopped"
+    success
+  else
+    echo -n $"unable to stop"
+    failure
+  fi
   echo
-  [ $RETVAL = 0 ] && rm -f ${pidfile}
+
+  return ${ret_val}
 }
-
+
+restart() {
+  local ret_val=0
+  local current_status=0
+
+  status &>/dev/null || current_status=${?}
+
+  case ${current_status} in
+  0)
+    # status returns 0 when the daemon is currently running
+    ( stop && start ) || ret_val=${?}
+    ;;
+  3)
+    if [ "${1}" == conditional ] ; then
+      # Do not return an error as this is desired behavior.
+      #failure "${NAME} is not currently running, will not start"
+      #ret_val=1
+      echo -n $"Cond-restart ${NAME}: daemon not currently running."
+      success
+      echo
+    else
+      ( stop && start ) || ret_val=${?}
+    fi
+    ;;
+  1)
+    # The status code for stale pid is 1.  For a restart, go ahead
+    # and try to start the daemon. try to start.  For cond-restart,
+    # throw an error and abort as it's unclear what the correct
+    # action should be when in this state.
+    if [ "${1}" == conditional ] ; then
+      echo -n $"Cond-restart ${NAME}: daemon not running but process locked."
+      failure
+      echo
+      ret_val=1
+    else
+      stop && start || ret_val=${?}
+    fi
+    ;;
+  *)
+    # Unknown status.  Don't try to start, no matter how called.
+    [ "${1}" == conditional ] && echo -n $'Cond-restart ' || echo -n $'Restarting '
+    echo -n $"${NAME}: daemon is in an unknown state (${current_status}), will not continue."
+    failure
+    echo
+    ret_val=${current_status}
+    ;;
+  esac
+
+  return ${ret_val}
+}
+
+usage() {
+  echo $"Usage: ${NAME} {start|stop|restart|condrestart|status}"
+  return 1
+}
+
 # See how we were called.
 case "$1" in
-  start)
-  start
-  ;;
-  stop)
-  stop
-  ;;
-  status)
-  status -p ${pidfile} ${prog}
-  RETVAL=$?
-  ;;
-  restart)
-  stop
-  start
+  start|stop|restart|status)
+  ${1}
   ;;
   condrestart)
-  if [ -f ${pidfile} ] ; then
-    stop
-    start
-  fi
+  restart conditional
   ;;
   *)
-  echo $"Usage: $prog {start|stop|restart|condrestart|status}"
-  exit 1
+  usage
+  ;;
 esac
-
-exit $RETVAL

manifests/config.pp

@@ -64,7 +64,7 @@
   $repeaterProtocol                  = $statsd::repeaterProtocol,
   $config                            = $statsd::config,
 
-  $environment = $statsd::environment,
+  $env_append  = $statsd::env_append,
   $nodejs_bin  = $statsd::nodejs_bin,
   $npm_bin     = $statsd::npm_bin,
   $statsjs     = "${statsd::node_module_dir}/statsd/stats.js",
@@ -91,7 +91,7 @@
     group  => 'root',
   }
 
-  file {  '/etc/default/statsd':
+  file {  $statsd::init_sysconfig:
     content => template('statsd/statsd-defaults.erb'),
     owner   => 'root',
     group   => 'root',

manifests/init.pp

@@ -4,7 +4,7 @@
   $node_module_dir                   = $statsd::params::node_module_dir,
   $nodejs_bin                        = $statsd::params::nodejs_bin,
   $npm_bin                           = $statsd::params::npm_bin,
-  $environment                       = $statsd::params::environment,
+  $env_append                        = $statsd::params::sysconfig_append,
 
   $port                              = $statsd::params::port,
   $address                           = $statsd::params::address,
@@ -85,6 +85,7 @@
   $config                            = $statsd::params::config,
 
   $init_location                     = $statsd::params::init_location,
+  $init_sysconfig                    = $statsd::params::init_sysconfig,
   $init_mode                         = $statsd::params::init_mode,
   $init_provider                     = $statsd::params::init_provider,
   $init_script                       = $statsd::params::init_script,

manifests/params.pp

@@ -4,7 +4,7 @@
   $node_module_dir                   = '/usr/lib/node_modules'
   $nodejs_bin                        = '/usr/bin/node'
   $npm_bin                           = '/usr/bin/npm'
-  $environment                       = []
+  $env_append                        = []
 
   $port                              = '8125'
   $address                           = '0.0.0.0'
@@ -92,16 +92,18 @@
 
   case $::osfamily {
     'RedHat', 'Amazon': {
-      $init_location = '/etc/init.d/statsd'
-      $init_mode     = '0755'
-      $init_provider = 'redhat'
-      $init_script   = 'puppet:///modules/statsd/statsd-init-rhel'
+      $init_location  = '/etc/init.d/statsd'
+      $init_sysconfig = '/etc/sysconfig/statsd'
+      $init_mode      = '0755'
+      $init_provider  = 'redhat'
+      $init_script    = 'puppet:///modules/statsd/statsd-init-rhel'
     }
     'Debian': {
-      $init_location = '/etc/init/statsd.conf'
-      $init_mode     = '0644'
-      $init_provider = 'upstart'
-      $init_script   = 'puppet:///modules/statsd/statsd-upstart'
+      $init_location  = '/etc/init/statsd.conf'
+      $init_sysconfig = '/etc/default/statsd'
+      $init_mode      = '0644'
+      $init_provider  = 'upstart'
+      $init_script    = 'puppet:///modules/statsd/statsd-upstart'
     }
     default: {
       fail('Unsupported OS Family')

templates/statsd-defaults.erb

@@ -1,11 +1,12 @@
 # HEADER: This file is being managed by Puppet. Any manual changes to this file
 # will be overwritten.
 
-<% @environment.each do |val| -%>
-<%= val %>
-<% end -%>
 NODEJS="<%= @nodejs_bin %>"
 STATSJS="<%= @statsjs %>"
 STATSD_CONFIG="<%= @configfile %>"
 STATSD_LOGFILE="<%= @logfile %>"
 DAEMON_ARGS="$STATSJS $STATSD_CONFIG $STATSD_LOGFILE"
+
+<% @env_append.each do |val| -%>
+<%= val %>
+<% end -%>