reacter 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705e53e181d608617873b15bfd3cf551c63f6b0f
-  data.tar.gz: b294a6dadfdc57f23a12e3e9c7eb88c7ff1bbcbf
+  metadata.gz: 698f0acf6a91c8a8f222c2b5a9c794a9649b1b9f
+  data.tar.gz: df4407d0644729a0f432e9dba966caa10fc30a27
 SHA512:
-  metadata.gz: 8a4f7b6cb348e915b831e14e8655ae42614b6af505357ab1d6eda503815183ffc75c178d9ebed2a1dffe1814ebfade07cac6c1c801ee482f20d546d9c417e957
-  data.tar.gz: c398d6e3c7bcbd9e7512c2ad2fcbe1768450bf5674bf356a222962042d8de5926c16126c1de90654c7c535875d9947a653a2c983fbe4202ff08b221c48729b70
+  metadata.gz: 9db488df26691082e2ef23d48675359075856e68a0936a803175ddf177508ea2f53fb4046eb49f35468733f45bb8ce412c7fdb864b0d116a8ea57152bd85deb8
+  data.tar.gz: f7478402230db72f05b0d8cfd91585a13aeb832d1c795e33669f0d4b7b40b23c842107cd8cd91ba02cd953f7e4385b2809fd246b10d931ed7f28bb9a51bb764d

data/lib/reacter/adapter.rb

@@ -6,12 +6,14 @@ require 'reacter/message'
 require 'reacter/config'
 require 'reacter/util'
 
-class AdapterConnectionFailed < Exception; end
-class AdapterConnectionFaulted < Exception; end
-class AdapterConnectionClosed < Exception; end
-class AdapterExit < Exception; end
 
 class Reacter
+  class AdapterConnectionFailed < Exception; end
+  class AdapterConnectionFaulted < Exception; end
+  class AdapterConnectionClosed < Exception; end
+  class AdapterExit < Exception; end
+
+
   class Adapter
     attr :config
     attr :type
@@ -42,7 +44,7 @@ class Reacter
 
   # implement: manual disconnect / cleanup
     def disconnect()
-      raise AdapterExit
+      @_connected = false
     end
 
     def disable()

data/lib/reacter/adapters/amqp.rb

@@ -10,14 +10,21 @@ class Reacter
     require 'amqp'
 
     DEFAULT_QUEUENAME='reacter'
+    DEFAULT_TIMEOUT=3
 
     def connect(args={})
+      @_errback = proc do
+        raise AdapterConnectionFailed
+      end
+
       @_connection = AMQP.connect({
         :host     => @config.get(:hostname, 'localhost'),
         :port     => @config.get(:port, 5672),
         :username => @config.get(:username, 'guest'),
         :password => @config.get(:password, 'guest'),
-        :vhost    => @config.get(:vhost, '/')
+        :vhost    => @config.get(:vhost, '/'),
+        :timeout  => @config.get(:timeout, DEFAULT_TIMEOUT),
+        :on_tcp_connection_failure => @_errback
       })
 
       @_channel  = AMQP::Channel.new(@_connection)

data/lib/reacter/core.rb

@@ -36,7 +36,6 @@ class Reacter
             @_adapters << instance
           else
             raise "Adapter '#{type}' not found, exiting"
-            exit 1
           end
         end
       else
@@ -80,21 +79,8 @@ class Reacter
         next unless adapter.enabled?
 
         poller = proc do
-          begin
-            adapter.poll do |messages|
-              dispatch.call(messages)
-            end
-          rescue AdapterConnectionFailed => e
-            Util.error("Adapter connection failed: #{e.message}")
-
-          rescue AdapterConnectionFaulted => e
-            Util.error("Adapter connection error: #{e.message}")
-
-          rescue AdapterConnectionClosed => e
-            Util.info("Adapter closed connection")
-
-          rescue AdapterExit => e
-            adapter.disable()
+          adapter.poll do |messages|
+            dispatch.call(messages)
           end
         end
 

data/lib/reacter/parser.rb

@@ -0,0 +1,23 @@
+class Reacter
+  class Message
+    class Parser
+      class<<self
+      # implement: determine whether the raw message is in a format this parser
+      #            can normalize
+        def detected?(message)
+          false
+        end
+
+      # implement: parse the raw input message, returning an array of Messages
+        def parse(message)
+          nil
+        end
+
+      # take a Message and return the orginal format
+        def dump(message)
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/reacter/parsers/collectd.rb

@@ -1,8 +1,8 @@
-require 'reacter/parsers/default'
+require 'reacter/parser'
 
 class Reacter
   class Message
-    class CollectdParser < DefaultParser
+    class CollectdParser < Parser
       class<<self
         def detected?(message)
           (message[0..6] == 'PUTVAL ')

data/lib/reacter/parsers/graphite.rb

@@ -1,8 +1,8 @@
-require 'reacter/parsers/default'
+require 'reacter/parser'
 
 class Reacter
   class Message
-    class GraphiteParser < DefaultParser
+    class GraphiteParser < Parser
       class<<self
       # Graphite
       #   |metric-----|value|epoch----|

data/lib/reacter/parsers/json.rb

@@ -1,8 +1,8 @@
-require 'reacter/parsers/default'
+require 'reacter/parser'
 
 class Reacter
   class Message
-    class JsonParser < DefaultParser
+    class JsonParser < Parser
       class<<self
         require 'json'
 

data/lib/reacter/parsers/tsdb.rb

@@ -1,8 +1,8 @@
-require 'reacter/parsers/default'
+require 'reacter/parser'
 
 class Reacter
   class Message
-    class TsdbParser < DefaultParser
+    class TsdbParser < Parser
       class<<self
         def detected?(message)
           return (message.upcase[0..4] == 'PUT ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reacter
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Gary Hetzel
@@ -71,8 +71,8 @@ files:
 - lib/reacter/config.rb
 - lib/reacter/core.rb
 - lib/reacter/message.rb
+- lib/reacter/parser.rb
 - lib/reacter/parsers/collectd.rb
-- lib/reacter/parsers/default.rb
 - lib/reacter/parsers/graphite.rb
 - lib/reacter/parsers/json.rb
 - lib/reacter/parsers/tsdb.rb

data/lib/reacter/parsers/default.rb

@@ -1,19 +0,0 @@
-class Reacter
-  class Message
-    class DefaultParser
-      class<<self
-        def detected?(message)
-          false
-        end
-
-        def parse(message)
-          nil
-        end
-
-        def dump(message)
-          nil
-        end
-      end
-    end
-  end
-end