flapjack 0.6.26 → 0.6.27

data/dist/etc/init.d/flapjack

@@ -27,6 +27,7 @@ fi
 # Evaluate command
 case "$1" in
   start)
+    rbenv shell 1.9.3-p125
     flapjack --config /etc/flapjack/flapjack-config.yaml --daemonize
     RETVAL=$?
   ;;

data/lib/flapjack/jabber.rb

@@ -19,6 +19,7 @@ require 'yajl/json_gem'
 require 'flapjack/data/entity_check'
 require 'flapjack/pikelet'
 require 'flapjack/utility'
+require 'flapjack/version'
 
 module Flapjack
 
@@ -162,8 +163,9 @@ module Flapjack
 
       when command =~ /^identify$/
         t = Process.times
-
-        msg  = "Flapjack process #{Process.pid} on #{`hostname -f`.chomp} \n"
+        boot_time = Time.at(@redis_handler.get('boot_time').to_i)
+        msg  = "Flapjack #{Flapjack::VERSION} process #{Process.pid} on #{`hostname -f`.chomp} \n"
+        msg += "Boot time: #{boot_time}\n"
         msg += "User CPU Time: #{t.utime}\n"
         msg += "System CPU Time: #{t.stime}\n"
         msg += `uname -a`.chomp + "\n"
@@ -275,9 +277,11 @@ module Flapjack
           logger.debug('jabber notification event received')
           logger.debug(event.inspect)
           if 'shutdown'.eql?(type)
-            EM.next_tick do
-              # get delays without the next_tick
-              close # Blather::Client.close
+            if should_quit?
+              EM.next_tick do
+                # get delays without the next_tick
+                close # Blather::Client.close
+              end
             end
             # FIXME: should we also set something so should_quit? returns true
             # to prevent retrieving more notifications from the queue while closing?

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.6.26"
+  VERSION = "0.6.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.26
+  version: 0.6.27
   prerelease: 
 platform: ruby
 authors: