pcp-client 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bbadd16844a443623b6d9d1389b580960b17592
-  data.tar.gz: cfe1c97388dbab0db4496b316f57961cc6e30d9d
+  metadata.gz: 8e54ff97949557ad0a4e596e76413517081ccd81
+  data.tar.gz: a0cea4f3e5409621326c214867455342bb268a55
 SHA512:
-  metadata.gz: d006505e2bfdee5de658da1a1dff1215d3a483ce4e7326815f8229b39f9acf61597686ad7c4a83e1e0d46e712aa8420742387743792df3212ef760bbeb25947d
-  data.tar.gz: ef1ab13ddaeffda48954bc65c8d7b1d28c62037667dad6d40708eb79c37c69544767cd41198778cf690bd35b547d759665020897f82774aa7c85c31af5a30f04
+  metadata.gz: 90899dbd9a381d8e9fcdc43a679fb17667c60e354e7a8b8f2b1d0e31e565c5454b9d3d5b4243bea3df85d706e15798afc33c4326b2bedc995d050b7e9f556e2f
+  data.tar.gz: 43ed81721fbfd41efefd81c7c929b5da7ac464fbe174b2b19ef4f9ad1ae8433cd6e6d2c7133f30d6d1fab660227e20f799f07d5b4e9c700f850881032da41eef

data/lib/pcp/client.rb

@@ -50,55 +50,58 @@ module PCP
       mutex = Mutex.new
       associated_cv = ConditionVariable.new
 
-      @logger.debug { [:connect, @server] }
-      @connection = Faye::WebSocket::Client.new(@server, nil, {:tls => {:private_key_file => @ssl_key,
-                                                                        :cert_chain_file => @ssl_cert,
-                                                                        :ssl_version => ["TLSv1", "TLSv1_1", "TLSv1_2"]}})
-
-      @connection.on :open do |event|
-        begin
-          @logger.info { [:open] }
-          send(associate_request)
-        rescue Exception => e
-          @logger.error { [:open_exception, e] }
+      @logger.debug { [:connect, :scheduling] }
+      EM.next_tick do
+        @logger.debug { [:connect, @server] }
+        @connection = Faye::WebSocket::Client.new(@server, nil, {:tls => {:private_key_file => @ssl_key,
+                                                                          :cert_chain_file => @ssl_cert,
+                                                                          :ssl_version => ["TLSv1", "TLSv1_1", "TLSv1_2"]}})
+
+        @connection.on :open do |event|
+          begin
+            @logger.info { [:open] }
+            send(associate_request)
+          rescue Exception => e
+            @logger.error { [:open_exception, e] }
+          end
         end
-      end
 
-      @connection.on :message do |event|
-        begin
-          message = ::PCP::Message.new(event.data)
-          @logger.debug { [:message, :decoded, message] }
+        @connection.on :message do |event|
+          begin
+            message = ::PCP::Message.new(event.data)
+            @logger.debug { [:message, :decoded, message] }
+
+            if message[:message_type] == 'http://puppetlabs.com/associate_response'
+              mutex.synchronize do
+                @associated = JSON.load(message.data)["success"]
+                associated_cv.signal
+              end
+            elsif @on_message
+              @on_message.call(message)
+            end
+          rescue Exception => e
+            @logger.error { [:message_exception, e] }
+          end
+        end
 
-          if message[:message_type] == 'http://puppetlabs.com/associate_response'
+        @connection.on :close do |event|
+          begin
+            @logger.info { [:close, event.code, event.reason] }
             mutex.synchronize do
-              @associated = JSON.load(message.data)["success"]
+              @associated = false
               associated_cv.signal
             end
-          elsif @on_message
-            @on_message.call(message)
+          rescue Exception => e
+            @logger.error { [:close_exception, e] }
           end
-        rescue Exception => e
-          @logger.error { [:message_exception, e] }
         end
-      end
 
-      @connection.on :close do |event|
-        begin
-          @logger.info { [:close, event.code, event.reason] }
-          mutex.synchronize do
-            @associated = false
-            associated_cv.signal
-          end
-        rescue Exception => e
-          @logger.error { [:close_exception, e] }
+        @connection.on :error do |event|
+          @logger.error { [:error, event] }
+          @associated = false
         end
       end
 
-      @connection.on :error do |event|
-        @logger.error { [:error, event] }
-        @associated = false
-      end
-
       if !EM.reactor_running?
         @logger.debug { [:no_eventmachine_reactor,
                          "Eventmachine reactor is not running" ] }
@@ -141,17 +144,21 @@ module PCP
     # @param message [PCP::Message]
     # @return unused
     def send(message)
-      @logger.debug { [:send, message] }
-      message[:sender] = identity
-      @connection.send(message.encode)
+      EM.next_tick do
+        @logger.debug { [:send, message] }
+        message[:sender] = identity
+        @connection.send(message.encode)
+      end
     end
 
     # Disconnect the client
     # @api public
     # @return unused
     def close
-      @logger.debug { [:close] }
-      @connection.close
+      EM.next_tick do
+        @logger.debug { [:close] }
+        @connection.close
+      end
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pcp-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine