omf_common 6.0.5 → 6.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjQwYWI3ZWUzZGQwNTU5ZmRhOGYzMTE1ZjE0ODVlZTQ0ZTQ3ODAxMw==
+    MDhiNzEzYjc1OTczZmI5NGM4OTg2YjBjODM0Zjk0NWQxYTJiNTgzNA==
   data.tar.gz: !binary |-
-    ZDRkNTMxZWY0MGE1MTkzZGZkYzU5MDk4NGQ1NWM4MGIxODEyYThmMA==
+    OTE2MzRhMjBlYzhiMDU0MTA4OTY1YTQ0ODFjN2RmNmQ5NTlkOWY4Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmYxNWExZTZlZDViZmQ3OGMyMmJkNGU2ZGU5OWQyYjZjODE4NjRiMmE4ZTRj
-    NWQ2YzNiNjFlMjBlOGYyMTU2YjkxYTg3OGNiZDg0MjNjODk3ODM1ZGJkMTg5
-    MGI4MTJmZjA2OGQ5OTk5OWFiNzFmY2ExZDcyNmM0OTUwNzlhMzU=
+    NGViOWZiYmZjZDIyMzY0Y2ZiZDUxZjQ1M2I0ZjAwNWViMTM3Y2JlOTIyYTg0
+    MjgwNzE1NjM3OTQ5NWQxNTFmM2I3MzM4OWU5MGFmOGUzYjM1OWFlMTg0ZjYz
+    ZjAzMDQzZTgzNjM4YjE3YjJhOGY5NTE4ZDQ0MDRmMWQwNzhlMGU=
   data.tar.gz: !binary |-
-    NTA1Yjc5M2Y1MGFlMDcxYWE1ZDE0NGUyMWIxZmU3ZWJhMzkyNTVjOTY1NTlm
-    ZjcxZDA2YmM4Y2NhYjdhNjYxNjlmNzM0YzE3MjYxNGJjYTA2MWYzMjE5MTc2
-    MjQ3NTRjMjU2NmU5MGU5NmM4M2UwOTg4MTE3MzQ4MmY2YWQ3MmE=
+    MzY3ZmY1NjkzMjg1YjMyMGNkZWM0YzdkZTM2Njc3YjFhZTAzYzdhMjI3NWU4
+    MjE2NGZkZTMxNjc5MGE4MGQyODQ1MjM1ZmRmZDU4YzEzNDQ4NDRiZWEzM2E4
+    OTFhNjg4YjZhOTkwNzM1OTNiYzAxMDE1ZTZlMDg3ZDEwMDU4NzQ=

data/lib/omf_common/comm/xmpp/communicator.rb

@@ -10,6 +10,18 @@ require 'omf_common/comm/xmpp/topic'
 require 'uri'
 require 'socket'
 
+module Blather
+  class Stream
+    def unbind
+      cleanup
+      raise NoConnection unless @inited
+      @state = :stopped
+      @client.receive_data @error if @error
+      @client.unbind
+    end
+  end
+end
+
 module OmfCommon
 class Comm
   class XMPP
@@ -19,6 +31,8 @@ class Comm
       attr_accessor :published_messages, :normal_shutdown_mode, :retry_counter
 
       HOST_PREFIX = 'pubsub'
+      RETRY_INTERVAL = 5
+      PING_INTERVAL = 5
 
       PUBSUB_CONFIGURE = Blather::Stanza::X.new({
         :type => :submit,
@@ -65,24 +79,35 @@ class Comm
 
         @retry_counter = 0
         @normal_shutdown_mode = false
+        @pong = true
 
         connect(username, password, server)
 
         when_ready do
-          @cbks[:connected].each { |cbk| cbk.call(self) }
+          @ping_alive_timer = OmfCommon.el.every(PING_INTERVAL) do
+            if @pong
+              ping_alive
+            else
+              warn "No connection..."
+              @ping_alive_timer.cancel
+              @not_initial_connection = true
+              OmfCommon.el.after(RETRY_INTERVAL) do
+                client.run
+              end
+            end
+          end
+          info "Reconnected" if @not_initial_connection
+          @cbks[:connected].each { |cbk| cbk.call(self) } unless @not_initial_connection
         end
 
         disconnected do
-          unless normal_shutdown_mode
-            unless retry_counter > 0
-              @retry_counter += 1
-              client.connect
-            else
-              error "Authentication failed."
-              OmfCommon.eventloop.stop
-            end
-          else
+          if normal_shutdown_mode
             shutdown
+          else
+            warn "No connection..."
+            OmfCommon.el.after(RETRY_INTERVAL) do
+              client.run
+            end
           end
         end
 
@@ -98,15 +123,21 @@ class Comm
         info "Connecting to '#{server}' ..."
         jid = "#{username}@#{server}"
         client.setup(jid, password)
-        client.run
-        MPConnection.inject(Time.now.to_f, jid, 'connect') if OmfCommon::Measure.enabled?
+        begin
+          client.run
+        rescue ::EventMachine::ConnectionError => e
+          warn "[#{e.class}] #{e}, try again..."
+          OmfCommon.el.after(RETRY_INTERVAL) do
+            connect(username, password, server)
+          end
+        end
       end
 
       # Shut down XMPP connection
       def disconnect(opts = {})
         # NOTE Do not clean up
-        info "Disconnecting ..."
         @normal_shutdown_mode = true
+        info "Disconnecting..."
         shutdown
         OmfCommon::DSL::Xmpp::MPConnection.inject(Time.now.to_f, jid, 'disconnect') if OmfCommon::Measure.enabled?
       end
@@ -228,6 +259,18 @@ class Comm
       def default_host
         @pubsub_host || "#{HOST_PREFIX}.#{jid.domain}"
       end
+
+      def ping_alive
+        @pong = false
+        client.write_with_handler Blather::Stanza::Iq::Ping.new(:get, jid.domain) do |response|
+          @pong = true
+          begin
+            handle_error response if response.is_a? Blather::BlatherError
+          rescue ProtocolError => e
+            raise unless e.name == :feature_not_implemented
+          end
+        end
+      end
     end
   end
 end

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.5"
+  VERSION = "6.0.6"
   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.5
+  version: 6.0.6
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest