simplepubsub 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4193fc0ed3384cdeb8ab00f6ec6977ec28e1b70
-  data.tar.gz: 0b0b38417f75b4179588093ca183a2d29cf414bb
+  metadata.gz: cfb14c303c576a5fc3ca6c8160ef526f306bc87b
+  data.tar.gz: 102d5dbfa5f4925c157c7f601057c81ab12e4bbb
 SHA512:
-  metadata.gz: cb424c06c857fa76c361f3345f5c1bc4cc311291746cabab853a5e4e57d3dcc2b23b87685cd857006ec9afd6232c8f8198d6c49d6d100a1ad05155b98219e507
-  data.tar.gz: a1709839802a3d0b8b3dba597a2b9ccf94e1b9a3ca4addb5af81a8df7a41eb38655755712ba4203fcecc7022c9b0a08ad99b594b33e83e31343f87749cf33510
+  metadata.gz: 58b2c22abd456d71018b03cd589db440307cde52e63a557d121dd49e700a6a1d3b1810c3f2a35af3f5fe5e6e7d3be2526f6bfd19a94e4ead06c24d166a6a855b
+  data.tar.gz: 4107e7cbcca9f0328b0495fe3612d646cca0b8a410297a8f1e70e0bf713e0a2d5afe136edb7522eccfeb90532ba0008d7b015bcd8f6aaa8d2bce50742ec7600e

data/lib/simplepubsub.rb

@@ -9,7 +9,7 @@ require 'xml-registry'
 
 module SimplePubSub
 
-  class Server
+  class Broker
 
     def self.start(host: '0.0.0.0', port: 59000)
 
@@ -89,7 +89,7 @@ module SimplePubSub
 
       attr_reader :proc, :topic, :message
 
-      def get(topic, &get_proc)
+      def get(topic, options={}, &get_proc)
 
         @topic = 'subscribe to topic'
         @proc, @message = get_proc, topic
@@ -104,7 +104,7 @@ module SimplePubSub
       end
     end
     
-    def self.connect(hostname, port: '59000', &connect_blk)
+    def self.connect(hostname, port: '59000', retry_count: nil, &connect_blk)
 
       pubsub = PubSub.new
       connect_blk.call(pubsub)
@@ -113,6 +113,7 @@ module SimplePubSub
 
         ws.onopen do
           puts "Connected"
+          retry_count = 0
         end
 
         ws.onmessage do |msg, type|
@@ -124,21 +125,27 @@ module SimplePubSub
         end
 
         ws.onclose do
-          puts "Disconnected"
 
-          # reconnect within a minute
-          seconds = rand(60)
 
-          seconds.downto(1) do |i| 
-            s = "reconnecting in %s seconds" % i; 
-            print s 
-            sleep 1
-            print "\b" * s.length
-          end
-          puts
+          if retry_count and retry_count <= 3 then
+            puts "Disconnected"
+
+            # reconnect within a minute
+            seconds = rand(60)
 
+            seconds.downto(1) do |i| 
+              s = "reconnecting in %s seconds" % i; 
+              print s 
+              sleep 1
+              print "\b" * s.length
+            end
+            puts
 
-          self.connect hostname, port: port, &connect_blk
+
+            self.connect hostname, port: port, retry_count: retry_count+1, &connect_blk
+          else
+            puts 'Unable to connect'
+          end
         end
 
         EventMachine.next_tick do
@@ -156,14 +163,14 @@ module SimplePubSub
         # attempt to run a websocket assuming the EventMachine is 
         #   already running
 
-        ws = c.connect(params, &connect_blk)
+        ws = c.connect(params)
         blk.call ws, pubsub, em_already_running = true
       rescue
 
         thread = Thread.new do
           EM.run do 
 
-            ws = c.connect(params, &connect_blk)
+            ws = c.connect(params)
             blk.call(ws, pubsub, em_already_running = false)
           end
         end
@@ -177,7 +184,7 @@ end
 if __FILE__ == $0 then
 
   # Server example
-  SimplePubSub::Server.new.start
+  SimplePubSub::Broker.start
 
 =begin
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplepubsub
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - James Robertson