reacter 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 705e53e181d608617873b15bfd3cf551c63f6b0f
+  data.tar.gz: b294a6dadfdc57f23a12e3e9c7eb88c7ff1bbcbf
+SHA512:
+  metadata.gz: 8a4f7b6cb348e915b831e14e8655ae42614b6af505357ab1d6eda503815183ffc75c178d9ebed2a1dffe1814ebfade07cac6c1c801ee482f20d546d9c417e957
+  data.tar.gz: c398d6e3c7bcbd9e7512c2ad2fcbe1768450bf5674bf356a222962042d8de5926c16126c1de90654c7c535875d9947a653a2c983fbe4202ff08b221c48729b70

data/lib/reacter/adapter.rb

@@ -9,15 +9,18 @@ require 'reacter/util'
 class AdapterConnectionFailed < Exception; end
 class AdapterConnectionFaulted < Exception; end
 class AdapterConnectionClosed < Exception; end
+class AdapterExit < Exception; end
 
 class Reacter
   class Adapter
     attr :config
     attr :type
+    attr :enable
 
     def initialize(config=nil)
       @config = (config || Reacter.get('global.adapter', {}))
       @type = @config.get('type')
+      @enable = true
       Util.info("Loading adapter #{@type}...")
     end
 
@@ -39,7 +42,19 @@ class Reacter
 
   # implement: manual disconnect / cleanup
     def disconnect()
-      raise AdapterConnectionClosed
+      raise AdapterExit
+    end
+
+    def disable()
+      @enable = false
+    end
+
+    def enable()
+      @enable = true
+    end
+
+    def enabled?()
+      @enable
     end
 
     class<<self

data/lib/reacter/adapters/amqp.rb

@@ -22,7 +22,10 @@ class Reacter
 
       @_channel  = AMQP::Channel.new(@_connection)
       @_queue    = @_channel.queue(@config.get(:queue, DEFAULT_QUEUENAME), {
-        :auto_delete => @config.get(:autodelete, true)
+        :auto_delete => @config.get(:autodelete, true),
+        :arguments => {
+          'x-message-ttl' => @config.get(:ttl)
+        }.compact
       })
 
       @_exchange = @config.get(:exchange, '')

data/lib/reacter/adapters/file.rb

@@ -9,15 +9,15 @@ class Reacter
   class FileAdapter < Adapter
     def connect(args={})
       if @config.get(:filename) == 'stdin'
-        @_stdin = true
+        @_input = STDIN
       else
-        @_stdin = false
-
-        readfile = (@config.get('filename') || @config.get('file.read'))
-        writefile = @config.get('file.write')
+        if (readfile = (@config.get('filename') || @config.get('file.read')))
+          @_input = File.open(File.expand_path(readfile), 'r+')
+        end
+      end
 
-        @_input = File.open(File.expand_path(readfile), 'r+') if readfile
-        @_output = File.open(File.expand_path(writefile), 'a') if writefile
+      if (writefile = @config.get('file.write'))
+        @_output = File.open(File.expand_path(writefile), 'a')
       end
     end
 
@@ -34,6 +34,7 @@ class Reacter
     def poll(&block)
       if @_input
         loop do
+          disconnect() if @_input.eof?
           line = @_input.gets
           yield Message.parse(line)
         end
@@ -43,7 +44,7 @@ class Reacter
     end
 
     def disconnect()
-      raise AdapterConnectionClosed
+      raise AdapterExit
     end
 
   private

data/lib/reacter/agents/relay.rb

@@ -9,19 +9,28 @@ class Reacter
     def initialize()
       super
 
-      if @config['type']
-        @_adapter = Adapter.create(@config['type'], @config)
-        raise "Could not create relay adapter #{@config['type']}" unless @_adapter
-        @_adapter.connect()
+      @_adapters = []
+      @_signature = Util.signature(object_id.to_s(16).upcase)
+
+      @config = (@config.is_a?(Hash) ? [@config] : [*@config])
+
+      @config.each do |c|
+        if c['type']
+          adapter = Adapter.create(c['type'], c)
+          adapter.connect()
+          @_adapters << adapter
+        end
       end
 
-      @_signature = Util.signature()
+      @_adapter_cycle = @_adapters.cycle.each
     end
 
     def received(message)
-      if @_adapter
-        message[:relayed_from] = @_signature unless (@config['transparent'] === true)
-        @_adapter.send(message, @config['format'])
+      adapter = @_adapter_cycle.next
+
+      if adapter
+        message[:relayed_from] = @_signature unless (adapter.config['transparent'] === true)
+        adapter.send(message, adapter.config['format'])
       else
         Util.warn("relay: Message received without an active relay adapter, dropping")
         return false

data/lib/reacter/core.rb

@@ -76,28 +76,44 @@ class Reacter
       end
 
     # enter polling loop
-      begin
-        @_adapters.each do |adapter|
-          poller = proc do
+      @_adapters.each do |adapter|
+        next unless adapter.enabled?
+
+        poller = proc do
+          begin
             adapter.poll do |messages|
               dispatch.call(messages)
             end
-          end
+          rescue AdapterConnectionFailed => e
+            Util.error("Adapter connection failed: #{e.message}")
 
-          EM.defer(poller)
-        end
+          rescue AdapterConnectionFaulted => e
+            Util.error("Adapter connection error: #{e.message}")
 
-      rescue AdapterConnectionFailed => e
-        Util.error("Adapter connection failed: #{e.message}")
+          rescue AdapterConnectionClosed => e
+            Util.info("Adapter closed connection")
 
-      rescue AdapterConnectionFaulted => e
-        Util.error("Adapter connection error: #{e.message}")
+          rescue AdapterExit => e
+            adapter.disable()
+          end
+        end
 
-      rescue AdapterConnectionClosed => e
-        Util.info("Adapter closed connection")
+        EM.defer(poller)
+      end
+
+      EM.add_periodic_timer(1) do
 
+      # exit if all adapters are disabled
+        if @_adapters.select{|i| i.enabled? }.empty?
+          Util.info("All adapters disabled, exiting")
+          stop()
+        end
       end
     end
+
+    def stop()
+      EM.stop_event_loop()
+    end
   end
 
   class<<self

data/lib/reacter/util.rb

@@ -11,7 +11,7 @@ class Reacter
       }
 
       def signature(custom=nil)
-        ([%x{hostname -f}.strip.chomp, Process.pid]+[*custom]).compact.join(':')
+        ([%x{hostname -f}.strip.chomp, Process.pid.to_s(16).upcase]+[*custom]).compact.join(':')
       end
 
       def log(message, severity=:info, log=:default)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reacter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Gary Hetzel
@@ -13,37 +12,46 @@ date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &9815500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9815500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &9813980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9813980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &9813340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9813340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A utility for consuming, transforming, and routing monitoring data from
   various sources
 email: ghetzel@outbrain.com
@@ -72,26 +80,25 @@ files:
 - bin/reacter
 homepage: http://outbrain.github.com/reacter/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Reacter monitoring processor
 test_files: []