omf_common 6.0.6 → 6.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDhiNzEzYjc1OTczZmI5NGM4OTg2YjBjODM0Zjk0NWQxYTJiNTgzNA==
+    OTdlZmJkZTY0ODNlZWZhNzQ2N2Y3NWYyYjMwNjBiOTRhYzFjNGE0NQ==
   data.tar.gz: !binary |-
-    OTE2MzRhMjBlYzhiMDU0MTA4OTY1YTQ0ODFjN2RmNmQ5NTlkOWY4Ng==
+    MDkzNTdhZWMyNGFmNGYxNTIxZjAwM2RkZjY0NTI1ODk2YjQ0MWEzOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGViOWZiYmZjZDIyMzY0Y2ZiZDUxZjQ1M2I0ZjAwNWViMTM3Y2JlOTIyYTg0
-    MjgwNzE1NjM3OTQ5NWQxNTFmM2I3MzM4OWU5MGFmOGUzYjM1OWFlMTg0ZjYz
-    ZjAzMDQzZTgzNjM4YjE3YjJhOGY5NTE4ZDQ0MDRmMWQwNzhlMGU=
+    MGJjYmQwOTIxODViYjZhYjg0YTBlMDI5MzkxODc1MTUxMDgwNWRkMTdiMWNi
+    ZTNiOGVlY2Y4N2QwZjQ3ZjQyN2NkY2I1YWUxOGUxMjA1NGUwZjQzNTVkNmJh
+    ZDE4NTBiMGMzYjU0ODA5NjY3MmM5ZmUwNjMzOWJlMjVmNmQ4ODM=
   data.tar.gz: !binary |-
-    MzY3ZmY1NjkzMjg1YjMyMGNkZWM0YzdkZTM2Njc3YjFhZTAzYzdhMjI3NWU4
-    MjE2NGZkZTMxNjc5MGE4MGQyODQ1MjM1ZmRmZDU4YzEzNDQ4NDRiZWEzM2E4
-    OTFhNjg4YjZhOTkwNzM1OTNiYzAxMDE1ZTZlMDg3ZDEwMDU4NzQ=
+    NjQ5NWI2YmY2MTFkNWQzM2U4ZjU3YmQ2NjBjOTFjZmEyNDJjOThiZGExZDcx
+    NDg3ZTllN2EwOGUzY2NmYTE3OGUzN2RkODcxZDM5YjNjZjhlOWRmYmYxZDM0
+    MmQ2NTMxZDY1NTAzMjcwZDlmZjdkZjc1NTY0YWJmZmFiZWE5YWQ=

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

@@ -3,12 +3,14 @@
 # You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
+require 'blather'
 require 'blather/client/dsl'
 
 require 'omf_common/comm/xmpp/xmpp_mp'
 require 'omf_common/comm/xmpp/topic'
 require 'uri'
 require 'socket'
+require 'monitor'
 
 module Blather
   class Stream
@@ -20,6 +22,12 @@ module Blather
       @client.unbind
     end
   end
+
+  class Client
+    def state
+      @state
+    end
+  end
 end
 
 module OmfCommon
@@ -31,8 +39,8 @@ class Comm
       attr_accessor :published_messages, :normal_shutdown_mode, :retry_counter
 
       HOST_PREFIX = 'pubsub'
-      RETRY_INTERVAL = 5
-      PING_INTERVAL = 5
+      RETRY_INTERVAL = 180
+      PING_INTERVAL = 1800
 
       PUBSUB_CONFIGURE = Blather::Stanza::X.new({
         :type => :submit,
@@ -61,6 +69,8 @@ class Comm
       # Set up XMPP options and start the Eventmachine, connect to XMPP server
       #
       def init(opts = {})
+        @lock = Monitor.new
+
         @pubsub_host = opts[:pubsub_domain]
         if opts[:url]
           url = URI(opts[:url])
@@ -79,34 +89,56 @@ class Comm
 
         @retry_counter = 0
         @normal_shutdown_mode = false
-        @pong = true
 
+        username.downcase!
+        jid = "#{username}@#{server}"
+        client.setup(jid, password)
         connect(username, password, server)
 
         when_ready do
-          @ping_alive_timer = OmfCommon.el.every(PING_INTERVAL) do
-            if @pong
-              ping_alive
-            else
-              warn "No connection..."
-              @ping_alive_timer.cancel
+          if @not_initial_connection
+            info "Reconnected"
+          else
+            info "Connected"
+            @cbks[:connected].each { |cbk| cbk.call(self) }
+            # It will be reconnection after this
+            @lock.synchronize do
               @not_initial_connection = true
-              OmfCommon.el.after(RETRY_INTERVAL) do
-                client.run
+            end
+          end
+
+          @lock.synchronize do
+            @pong = true
+            @ping_alive_timer = OmfCommon.el.every(PING_INTERVAL) do
+              if @pong
+                @lock.synchronize do
+                  @pong = false # Reset @pong
+                end
+                ping_alive
+              else
+                warn "No PONG. No connection..."
+                @lock.synchronize do
+                  @ping_alive_timer.cancel
+                end
+                connect(username, password, server)
               end
             end
           end
-          info "Reconnected" if @not_initial_connection
-          @cbks[:connected].each { |cbk| cbk.call(self) } unless @not_initial_connection
         end
 
         disconnected do
+          @lock.synchronize do
+            @pong = false # Reset @pong
+            @ping_alive_timer && @ping_alive_timer.cancel
+          end
+
           if normal_shutdown_mode
             shutdown
           else
-            warn "No connection..."
-            OmfCommon.el.after(RETRY_INTERVAL) do
-              client.run
+            warn "Disconnected... Last known state: #{client.state}"
+            retry_interval = client.state == :initializing ? 0 : RETRY_INTERVAL
+            OmfCommon.el.after(retry_interval) do
+              connect(username, password, server)
             end
           end
         end
@@ -121,11 +153,9 @@ class Comm
       #
       def connect(username, password, server)
         info "Connecting to '#{server}' ..."
-        jid = "#{username}@#{server}"
-        client.setup(jid, password)
         begin
           client.run
-        rescue ::EventMachine::ConnectionError => e
+        rescue ::EventMachine::ConnectionError, Blather::Stream::ConnectionTimeout, Blather::Stream::NoConnection, Blather::Stream::ConnectionFailed => e
           warn "[#{e.class}] #{e}, try again..."
           OmfCommon.el.after(RETRY_INTERVAL) do
             connect(username, password, server)
@@ -136,7 +166,9 @@ class Comm
       # Shut down XMPP connection
       def disconnect(opts = {})
         # NOTE Do not clean up
-        @normal_shutdown_mode = true
+        @lock.synchronize do
+          @normal_shutdown_mode = true
+        end
         info "Disconnecting..."
         shutdown
         OmfCommon::DSL::Xmpp::MPConnection.inject(Time.now.to_f, jid, 'disconnect') if OmfCommon::Measure.enabled?
@@ -261,13 +293,10 @@ class Comm
       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
+          info response
+          @lock.synchronize do
+            @pong = true
           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.6"
+  VERSION = "6.0.7"
   PROTOCOL_VERSION = "6.0"
 end

data/omf_common.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
 
   s.add_runtime_dependency "eventmachine", "= 1.0.3"
-  s.add_runtime_dependency "blather", "= 0.8.4"
+  s.add_runtime_dependency "blather", "= 0.8.7"
   s.add_runtime_dependency "logging", "~> 1.7.1"
   s.add_runtime_dependency "hashie", "~> 1.2.0"
   s.add_runtime_dependency "oml4r", "~> 2.9.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.0.7
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement