timshadel-starling 0.9.8.20080924 → 0.9.8.200810061510

data/CHANGELOG

@@ -1,5 +1,7 @@
 == 0.9.9
 * remove dependency on SyslogLogger so that starling works on windows.
+* fix config file loading so relative paths are expanded properly <jacob@jacobatzen.dk>
+* clean up redhat init.d script <gaffneyc@gmail.com>
 
 == 0.9.8
 * add fix to enable relative paths <david@motorator.com>

data/etc/starling.redhat

@@ -1,63 +1,66 @@
 #!/bin/bash
 #
+# Make sure the /var/run/starling, /var/log/starling and /var/spool/starling
+# all exist and are owned by starling:starling
+#
 # starling    This shell script takes care of starting and stopping
 #                    the starling server
 # chkconfig: 345 98 98
 # description: The starling queue server
+# processname: starling
+# pidfile: /var/run/starling/starling.pid
+# logfile: /var/log/starling/starling.log
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source networking configuration.
+[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
+
+DUSER=starling
+DGROUP=starling
+LOGFILE=/var/log/starling/starling.log
+SPOOLDIR=/var/spool/starling
+PORT=22122
+LISTEN=0.0.0.0
+PIDFILE=/var/run/starling/starling.pid
 
-#determine where the 'pidof' executable is located
-if [ -e /bin/pidof ]; then
-  PIDOF="/bin/pidof"
-elif [ -e /sbin/pidof ]; then
-  PIDOF="/sbin/pidof"
-elif [ -e /usr/local/bin/pidof ]; then
-  PIDOF="/usr/local/bin/pidof"
-elif [ -e /bin/pgrep ]; then
-  PIDOF="/bin/pgrep"
-elif [ -e /usr/bin/pgrep ]; then
-  PIDOF="/usr/bin/pgrep"
-elif [ -e /usr/local/bin/pgrep ]; then
-  PIDOF="/usr/local/bin/pgrep"
-else
-  echo "Could not find pidof or pgrep"
-fi
-
-PROGDIR="/usr/bin"
-PROGNAME="starling"
-OPTIONS="-u nobody -g nobody -L /var/log/starling.log -q /var/spool/starling"
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+NAME=starling
+INSTALL_DIR=/usr/local/bin
+DAEMON=$INSTALL_DIR/$NAME
+OPTS="-h $LISTEN -p $PORT -d -q $SPOOLDIR -P $PIDFILE -L $LOGFILE -u $DUSER -g $DGROUP"
 
 start() {
-  pid=`$PIDOF $PROGNAME`
-  if [ "$pid" != "" ]; then
-    echo "$PROGDIR$PROGNAME already running: $pid"
-  else
-    echo "Starting $PROGDIR$PROGNAME"
-    cd $PROGDIR
-    nohup $PROGDIR$PROGNAME $OPTIONS &
-  fi
+  echo -n $"Starting starling: "
+
+  daemon --pidfile=$PIDFILE $DAEMON $OPTS
+  echo
 }
 
 stop() {
-  pid=`$PIDOF $PROGNAME`
-  if [ "$pid" != "" ]; then
-    echo "Stopping $PROGDIR$PROGNAME: $pid"
-    kill $pid
-  else
-    echo "$PROGDIR$PROGNAME not running"
-  fi
+  echo -n $"Stopping starling: "
+
+  killproc -p $PIDFILE starling
+  echo
 }
 
 case "$1" in
-start)
-  start
-;;
-stop)
-  stop
-;;
-restart)
-  stop
-  sleep 3
-  start
-;;
-
+  start)
+    start
+  ;;
+  stop)
+    stop
+  ;;
+  restart)
+    stop
+    sleep 3
+    start
+  ;;
+  status)
+    status -p $PIDFILE starling
+  ;;
+  *)
+    echo $"Usage: $0 {start|stop|restart|status}"
+    exit 1
 esac

data/lib/starling/handler.rb

@@ -143,8 +143,7 @@ STAT queue_%s_age %d\r\n".freeze
   private
   
     def delete(queue)
-      @queue_collection.queues(queue).close
-      @queue_collection.queues.delete(queue)
+      @queue_collection.delete(queue)
       respond DELETE_RESPONSE
     end
   

data/lib/starling/persistent_queue.rb

@@ -83,6 +83,11 @@ module StarlingServer
       @trx = nil
       @not_trx.close
     end
+    
+    def purge
+      close
+      File.delete(log_path)
+    end
 
     private
 

data/lib/starling/queue_collection.rb

@@ -59,6 +59,12 @@ module StarlingServer
       @stats[:current_bytes] -= result.size
       result
     end
+    
+    def delete(key)
+      queue = @queues.delete(key)
+      return if queue.nil?
+      queue.purge
+    end
 
     ##
     # Returns all active queues.

data/lib/starling/server_runner.rb

@@ -40,6 +40,11 @@ module StarlingServer
         when "queue_path" then key = "path"
         when "log_file" then key = "logger"
         end
+
+        if %w(logger path pid_file).include?(key)
+          value = File.expand_path(value)
+        end
+
         options[key.to_sym] = value
 
         if options[:log_level].instance_of?(String)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timshadel-starling
 version: !ruby/object:Gem::Version 
-  version: 0.9.8.20080924
+  version: 0.9.8.200810061510
 platform: ruby
 authors: 
 - Blaine Cook
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency