eatmysoul 0.1.1 → 0.1.2

data/bin/eatmysoul

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'daemons'
-require 'eatmysoul'
+load 'lib/eatmysoul.rb'
 
 daemon_options = {
   :app_name   => "eatmysoul",
@@ -46,6 +46,6 @@ daemon_options = {
 Daemons.run_proc('eatmysoul', daemon_options) do
   o = EatMySoul::Settings.new
   Signal.trap("PIPE") { EatMySoul.connect_loop o }
-  EatMySoul.connect_loop(o)
+  EatMySoul::Manager.instance.connect_loop(o)
 end
 

data/lib/eatmysoul.rb

@@ -32,15 +32,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'eventmachine'
+require 'singleton'
 require 'yaml'
 require 'logger'
 require 'digest/md5'
 require 'trollop'
 
 module EatMySoul
-  @@active_connection = nil
-  @@monitor = nil
-
   class Settings
     # edit the next line to change the default path
     def initialize()
@@ -133,7 +131,7 @@ module EatMySoul
       @o = settings
       @status = NOT_CONNECTED
       @last_ping = Time.now
-      @@active_connection = self
+      Manager.instance.active_connection = self
     end
 
     def post_init
@@ -157,7 +155,7 @@ module EatMySoul
     end
 
     def unbind
-      @@active_connection = nil
+      Manager.instance.active_connection = nil
       EM.add_timer(5) { EM.connect @o.server, @o.port, Netsoul, @o }
     end
 
@@ -222,40 +220,48 @@ module EatMySoul
       str.gsub!(' ', '+')
       str
     end
+  end # class Netsoul
 
-  end
 
-  def self.run(o)
-    EM.run do
-      @@monitor = EM::add_periodic_timer(5) { self.monitor o } unless @@monitor
-      EM.connect o.server, o.port, Netsoul, o
+  class Manager
+    include Singleton
+    attr_accessor :active_connection, :monitor_timer
+
+    def run(o)
+      EM.run do
+        monitor_timer = EM::add_periodic_timer(1) { monitor o } unless monitor_timer
+        EM.connect o.server, o.port, Netsoul, o
+      end
     end
-  end
 
-  def self.connect_loop(o)
-    while true do
-      sleep_time = 0
+    def connect_loop(o)
+      while true do
+        sleep_time = 0
 
-      begin
-        self.run(o)
-      rescue => e
-        o.logger.fatal "Rescued from exception #{e}"
-        o.logger.debug e.backtrace.join "\n"
-      end
+        begin
+          self.run(o)
+        rescue => e
+          o.logger.fatal "Rescued from exception #{e}"
+          o.logger.debug e.backtrace.join "\n"
+        end
 
-      sleep sleep_time
-      sleep_time = sleep_time + 5 if sleep_time < 120
+        sleep sleep_time
+        sleep_time = sleep_time + 5 if sleep_time < 120
+      end
     end
-  end
 
-  def self.monitor(o)
-    if @@active_connection
-      if (Time.now - @@active_connection.last_ping) > 700
-        o.logger.warn "Connection seems inactive, restarting ..."
-        @@active_connection.close_connection
+    def monitor(o)
+      if active_connection
+        o.logger.debug "Checking for connection inactivity"
+        if (Time.now - active_connection.last_ping) > 650
+          o.logger.warn "Connection seems inactive, restarting ..."
+          active_connection.close_connection
+        end
       end
     end
-  end
 
-end
+  end # class Manager
+
+
+end # module EatmySoul
 

data/lib/eatmysoul/version.rb

@@ -1,3 +1,3 @@
 module Eatmysoul
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,38 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: eatmysoul
 version: !ruby/object:Gem::Version
-  version: 0.1.1
   prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Julien 'Lta' BALLET
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &14068940 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *14068940
-- !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: &14068520 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: eventmachine
+- !ruby/object:Gem::Dependency
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *14068520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: daemons
 description: A simple netsoul (epitech's internal network protocol) client, mainly
   targeting servers
 email:
@@ -73,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: eatmysoul
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple chatless netsoul client