omf_common 6.0.4.pre.1 → 6.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTRlZWFhMDI4MWE0NDQ2ZDIxM2U3ZWVlZWM0NmIzN2QzMTNjZGUwNA==
+    MGMxMmVlYjViNTBmOGM2ZmVmZWY5OTNmMDVmNTcyYzJkNjc5OTU5Ng==
   data.tar.gz: !binary |-
-    OTBhNDQ5NWZiOGRmNWRhZWYwOTJjMGQwYWNmNDBlZjJjMjhkZTRlYg==
+    OGIwZTAwNmI4ZmI3MDE1MzU0ZDQ5ZDM5YmNmOWQ0ZWFhOWQ1YThlOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDk2NDE0N2JjMmE0YzMwYTk3NzFiNTJiM2I2MWVhNjNlZTEwYmY2MjUwOGI4
-    ZDQ5NmFiZTU3NmE2NzNjZThiNDIyYTVmOWYxYjJiM2I2NzFjMTEzOGQzM2Mz
-    ZDg2YWM0Y2YyY2MxZDM1ZDUyYjU5YTZlMDk4NjE3NjExZWE0MjU=
+    Yzk3YWE4NzllMmQxYTMxZWUxNzZkMzc1YTQ4MzY5ZGY3NWMzOTAzOTlhMDZk
+    M2FjMTkyOGI0YWYyMjk0NWQyOWQ1ODFmZDhlZWNmNWVjNDA0YWUzYmQ0NWFh
+    OTcwMDBjNjM3ZWUyNDU5NzI3ZDk3MDQ1MDM0ZjRlNDJlYjc4OTM=
   data.tar.gz: !binary |-
-    NTkwNWZiZmZlZWI2N2NjMWYzODhhMzE5YzBiYzdkZjk5ZDM2ZmNmZDM2NmUy
-    ZDQ0M2MzNDczYmZjZjM4NGQ1ZGNlNDY1M2U5NDkzN2Q2MWRhMWRmNjRiNGE2
-    ZmIzZGQyMTdiZWY2MTVkNjlmNTM3NGQyYjkwOGU1M2IxMTNhYWQ=
+    ZTc1NmQ4ZDA0ZjU4ZmFkMzFkY2QzMTk5OWQ1MWE3ZmJjZDc0YmMxNmUzYjg1
+    MjFkMGZlMWJlNjgwMDJmNWI3OGZjMjNmNDAzYTcxNWM0ZGJlYjAyZTBlYTBl
+    YzIzZGVjMTBiMzUyN2FhMDMxOWJmZDliZDhjNDM0Y2U3NzYxODc=

data/bin/omf_monitor_topic

@@ -12,6 +12,12 @@ that there will be a delay until the new monitors are in place which
 can result in missed messages.
 }
 
+# The following is to work around a bug in activesupport triggered by
+# the JWT library which is used only in the AMQP transport, os it
+# fails quietly if that library is not installed in XMPP deployments
+begin; require 'json/jwt'; rescue Exception; end
+
+
 require 'optparse'
 require 'omf_common'
 

data/bin/omf_send_configure

@@ -10,6 +10,11 @@ Any additional command line arguments are interpreted as property:value and are
 sent with the create message.
 }
 
+# The following is to work around a bug in activesupport triggered by
+# the JWT library which is used only in the AMQP transport, os it
+# fails quietly if that library is not installed in XMPP deployments
+begin; require 'json/jwt'; rescue Exception; end
+
 require 'omf_common'
 
 OP_MODE = :development

data/bin/omf_send_create

@@ -10,6 +10,11 @@ Any additional command line arguments are interpreted as property:value and are
 sent with the create message.
 }
 
+# The following is to work around a bug in activesupport triggered by
+# the JWT library which is used only in the AMQP transport, os it
+# fails quietly if that library is not installed in XMPP deployments
+begin; require 'json/jwt'; rescue Exception; end
+
 require 'omf_common'
 
 OP_MODE = :development

data/bin/omf_send_request

@@ -10,6 +10,12 @@ Any additional command line arguments are interpreted as limiting the request
 to those, otherwise all properties are requested.
 }
 
+# The following is to work around a bug in activesupport triggered by
+# the JWT library which is used only in the AMQP transport, os it
+# fails quietly if that library is not installed in XMPP deployments
+begin; require 'json/jwt'; rescue Exception; end
+
+
 require 'omf_common'
 
 OP_MODE = :development

data/lib/omf_common/comm/amqp/amqp_communicator.rb

@@ -34,7 +34,6 @@ module OmfCommon
           end
           @address_prefix = @url + '/'
           _connect()
-          #AMQP::Session#on_skipped_heartbeats callback that can be used to handle skipped heartbeats
           super
         end
 
@@ -119,60 +118,78 @@ module OmfCommon
         end
 
         def _connect()
-          last_reported_timestamp = nil
-          @session = ::AMQP.connect(@url, @opts) do |connection|
-            connection.on_tcp_connection_loss do |conn, settings|
-              now = Time.now
-              if last_reported_timestamp == nil || (now - last_reported_timestamp) > 60
-                warn "Lost connectivity. Trying to reconnect..."
-                last_reported_timestamp = now
+          begin
+            last_reported_timestamp = nil
+            @session = ::AMQP.connect(@url, @opts) do |connection|
+              connection.on_tcp_connection_loss do |conn, settings|
+                now = Time.now
+                if last_reported_timestamp == nil || (now - last_reported_timestamp) > 60
+                  warn "Lost connectivity. Trying to reconnect..."
+                  last_reported_timestamp = now
+                end
+                _reconnect(conn)
               end
-              conn.reconnect(false, 2)
-            end
-            @channel  = ::AMQP::Channel.new(connection)
-            @channel.auto_recovery = true
+              @channel  = ::AMQP::Channel.new(connection)
+              @channel.auto_recovery = true
 
+              @on_connected_procs.each do |proc|
+                proc.arity == 1 ? proc.call(self) : proc.call
+              end
 
-            @on_connected_procs.each do |proc|
-              proc.arity == 1 ? proc.call(self) : proc.call
+              OmfCommon.eventloop.on_stop do
+                connection.close
+              end
             end
 
-            OmfCommon.eventloop.on_stop do
-              connection.close
+            rec_delay = @opts[:reconnect_delay]
+            @session.on_tcp_connection_failure do
+              warn "Cannot connect to AMQP server '#{@url}'. Attempt to retry in #{rec_delay} sec"
+              @session = nil
+              OmfCommon.eventloop.after(rec_delay) do
+                info 'Retrying'
+                _connect
+              end
             end
-          end
-
-          rec_delay = @opts[:reconnect_delay]
-          @session.on_tcp_connection_failure do
-            warn "Cannot connect to AMQP server '#{@url}'. Attempt to retry in #{rec_delay} sec"
-            @session = nil
-            OmfCommon.eventloop.after(rec_delay) do
-              info 'Retrying'
-              _connect
+            # @session.on_tcp_connection_loss do
+              # _reconnect "Appear to have lost tcp connection. Attempt to reconnect in #{rec_delay} sec"
+            # end
+            @session.on_skipped_heartbeats do
+              info '... on_skipped_heartbeats!'
+              #_reconnect "Appear to have lost heartbeat. Attempt to reconnect in #{rec_delay} sec"
             end
+            @session.on_recovery do
+              info 'Recovered!'
+              last_reported_timestamp = nil
+              @on_reconnect.values.each do |block|
+                block.call()
+              end
+            end
+            true
+          rescue Exception => ex
+            delay = @opts[:reconnect_delay]
+            warn "Connecting AMQP failed, will retry in #{delay} (#{ex})"
+            OmfCommon.eventloop.after(delay) do
+              if _connect
+                info 'Reconnection suceeded'
+              end
+            end
+            false
           end
-          # @session.on_tcp_connection_loss do
-            # _reconnect "Appear to have lost tcp connection. Attempt to reconnect in #{rec_delay} sec"
-          # end
-          # @session.on_skipped_heartbeats do
-            # _reconnect "Appear to have lost heartbeat. Attempt to reconnect in #{rec_delay} sec"
-          # end
-          @session.on_recovery do
-            info 'Recovered!'
-            last_reported_timestamp = nil
-            @on_reconnect.values.each do |block|
-              block.call()
+        end
+
+        def _reconnect(conn)
+          begin
+            conn.reconnect(false, 2)
+          rescue Exception => ex
+            delay = @opts[:reconnect_delay]
+            warn "Reconnect AMQP failed, will retry in #{delay} (#{ex})"
+            OmfCommon.eventloop.after(delay) do
+              info 'Reconnecting'
+              _reconnect(conn)
             end
           end
         end
 
-        # def _reconnect(warn_message = nil)
-          # warn(warn_message) if warn_message
-          # OmfCommon.eventloop.after(@opts[:reconnect_delay]) do
-            # info 'Reconnecting'
-            # @session.reconnect
-          # end
-        # end
       end
     end
   end

data/lib/omf_common/exec_app.rb

@@ -37,7 +37,7 @@ require 'fcntl'
 # Borrows from Open3
 #
 class ExecApp
-  
+
   # Holds the pids for all active apps
   @@all_apps = Hash.new
 
@@ -55,7 +55,7 @@ class ExecApp
   end
 
   attr_reader :pid, :clean_exit
-  
+
   # True if this active app is being killed by a proper
   # call to ExecApp.signal_all() or signal()
   # (i.e. when the caller of ExecApp decided to stop the application,
@@ -70,11 +70,11 @@ class ExecApp
   end
 
   def signal(signal = 'KILL')
+    logger.debug "Sending signal '#{signal}' to app '#{@id}' with pid #{@pid}"
     @clean_exit = true
     Process.kill(signal, -1 * @pid) # we are sending to the entire process group
   end
 
-
   #
   # Run an application 'cmd' in a separate thread and monitor
   # its stdout. Also send status reports to the 'observer' by
@@ -115,9 +115,9 @@ class ExecApp
       pe[1].close
 
       begin
-        pgid = Process.setsid # Create a new process group 
+        pgid = Process.setsid # Create a new process group
                               # which includes all potential child processes
-        STDOUT.puts "INTERNAL WARNING: Assuming process_group_id == pid" unless pgid == $$ 
+        STDOUT.puts "INTERNAL WARNING: Assuming process_group_id == pid" unless pgid == $$
         Dir.chdir working_directory if working_directory
         exec(cmd)
       rescue => ex
@@ -135,9 +135,10 @@ class ExecApp
     monitor_pipe(map_std_err_to_out ? :stdout : :stderr, pe[0])
     # Create thread which waits for application to exit
     @threads << Thread.new(id, @pid) do |id, pid|
-      ret = Process.waitpid(pid)
-      @exit_status = $?.exitstatus
-      if @exit_status > 127 
+      Process.waitpid(pid)
+      # Exit status is sometimes nil (OSX 10.8, ping)
+      @exit_status = $?.exitstatus || 0
+      if @exit_status > 127
         @exit_status = 128 - @exit_status
       end
       @@all_apps.delete(@id)
@@ -149,7 +150,7 @@ class ExecApp
       end
     end
     @stdin = pw[1]
-    
+
     # wait for done in yet another thread
     Thread.new do
       @threads.each {|t| t.join }
@@ -157,7 +158,7 @@ class ExecApp
     end
     logger.debug "Application is running with PID #{@pid}"
   end
-    
+
   private
 
   #
@@ -184,7 +185,7 @@ class ExecApp
       end
     end
   end
-  
+
   def call_observer(event_type, msg)
     return unless @observer
     begin

data/lib/omf_common/version.rb

@@ -4,6 +4,6 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 module OmfCommon
-  VERSION = "6.0.4.pre.1"
+  VERSION = "6.0.4"
   PROTOCOL_VERSION = "6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.4.pre.1
+  version: 6.0.4
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -263,9 +263,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: omf_common
 rubygems_version: 2.0.7