jacha 0.0.1 → 0.0.2

data/lib/jacha/connection.rb

@@ -3,36 +3,34 @@ require 'xmpp4r'
 module Jacha
   class Connection
 
-    attr_reader :jabber
-    attr_accessor :pool
+    attr_reader :jabber, :pool
 
-    def initialize(jid, password)
+    def initialize(jid, password, pool=nil)
       @password = password
       @jabber = Jabber::Client.new "#{jid}/#{Time.now.to_f}"
-      @jabber.on_exception do
+      @pool = pool
+      @jabber.on_exception do |ex, stream, place|
         unless broken?
           broken!
-          logger.warn "#{Time.now}: broken XmppConnection: #{self}"
+          logger.warn "#{Time.now}: broken XmppConnection: #{self}: #{ex} at #{place}"
           destroy
-          pool.respawn
+          @pool.respawn if @pool
         end
       end
-      connect!
+    end
+
+    def connect!
+      jabber_connect!
       @pinger = Thread.new do
         while true
           if connected?
             sleep 180
             online!
           else
-            connect!
+            jabber_connect!
           end
         end
       end
-    end
-
-    def connect!
-      @jabber.connect
-      @jabber.auth @password
       online!
     end
 
@@ -77,8 +75,8 @@ module Jacha
 
     def destroy
       broken!
-      @pinger.kill
-      @jabber.close
+      @pinger.kill if @pinger
+      @jabber.close if @jabber
     end
 
     def broken!
@@ -90,7 +88,12 @@ module Jacha
     end
 
     def logger
-      pool.logger
+      @pool && @pool.logger || (@logger ||= Logger.new(STDOUT))
+    end
+
+    def jabber_connect!
+      @jabber.connect
+      @jabber.auth @password
     end
   end
 end

data/lib/jacha/connection_pool.rb

@@ -2,11 +2,7 @@ module Jacha
   class ConnectionPool
     include Singleton
 
-    attr_accessor :jid, :password, :size, :logger
-
-    def pool
-      @connections ||= []
-    end
+    attr_accessor :jid, :password, :size, :logger, :retry_delay, :connect_timeout
 
     def size
       @size ||= 3
@@ -16,6 +12,18 @@ module Jacha
       @logger ||= Logger.new(STDOUT)
     end
 
+    def retry_delay
+      @retry_delay ||= 7
+    end
+
+    def connect_timeout
+      @connect_timeout ||= 7
+    end
+
+    def pool
+      @connections ||= []
+    end
+
     def get_connection
       pool.sample
     end
@@ -25,22 +33,22 @@ module Jacha
         logger.warn "#{Time.now}: Spawning XmppConnection"
         spawner = Thread.new do
           begin
-            connection = Connection.new @jid, @password
+            connection = Connection.new @jid, @password, self
+            connection.connect!
             spawner[:connection] = connection
           rescue => ex
             logger.warn "#{Time.now}: Error on XmppConnection spawn: #{ex}"
           end
         end
-        spawner.join 7
+        spawner.join connect_timeout
         connection = spawner[:connection]
         spawner.kill
         if connection && connection.connected?
-          connection.pool = self
-          pool << connection
+          pool.push connection
           logger.warn "#{Time.now}: XmppConnection spawned: #{connection}"
         else
-          logger.warn "#{Time.now}: XmppConnection spawn failed. Retrying in 7 seconds."
-          sleep 7
+          logger.warn "#{Time.now}: XmppConnection spawn failed. Retrying in #{retry_delay} seconds."
+          sleep retry_delay
           spawn 1
         end
       end
@@ -48,7 +56,7 @@ module Jacha
 
     def respawn
       pool.delete_if &:broken?
-      spawn @size - pool.size
+      spawn size - pool.size
     end
 
     def destroy

data/lib/jacha/version.rb

@@ -1,3 +1,3 @@
 module Jacha
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jacha
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r