amiral 0.1.5 → 0.1.6

data/lib/amiral/version.rb

@@ -1,3 +1,3 @@
 module Amiral
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/amiral.rb

@@ -101,7 +101,6 @@ module Amiral
         status = POpen4::popen4("service #{service} #{action}"){|stdout, stderr, stdin, pid|
           out = stdout.read
           err = stderr.read
-          
         }
         {
           :exit => status.exitstatus,
@@ -289,35 +288,41 @@ module Amiral
     end
 
     def listen
-      prefix = @settings[:prefix]
-      @redis_in.subscribe "#{prefix}req" do |on|
+      begin
+        prefix = @settings[:prefix]
+        @redis_in.subscribe "#{prefix}req" do |on|
         
-        on.message do |x, payload|
+          on.message do |x, payload|
 
-          @logger.debug "incoming message"
-          message = deserialize payload
+            @logger.debug "incoming message"
+            message = deserialize payload
         
-          if agent_matches? message['match']
-            @logger.info "valid request type: #{message['command']['provider']}"
-            uuid = uuidgen
-            send_ack(:in_reply_to => message['reply_to'],
-                     :uuid => uuid,
-                     :status => "start")
-            begin
-              out = execute message
-            rescue Exception => e
-              @logger.error "provider crashed: #{e}"
-              @logger.error e
+            if agent_matches? message['match']
+              @logger.info "valid request type: #{message['command']['provider']}"
+              uuid = uuidgen
+              send_ack(:in_reply_to => message['reply_to'],
+                       :uuid => uuid,
+                       :status => "start")
+              begin
+                out = execute message
+              rescue Exception => e
+                @logger.error "provider crashed: #{e}"
+                @logger.error e
+              end
+              send_response(:in_reply_to => message['reply_to'],
+                            :uuid => uuid,
+                            :status => "complete",
+                            :output => out)
+            else
+              send_ack(:in_reply_to => message['reply_to'],
+                       :status => "noop")
             end
-            send_response(:in_reply_to => message['reply_to'],
-                          :uuid => uuid,
-                          :status => "complete",
-                          :output => out)
-          else
-            send_ack(:in_reply_to => message['reply_to'],
-                     :status => "noop")
           end
         end
+      rescue Redis::BaseConnectionError => error
+        @logger.error "connection hung up: #{error}"
+        sleep 1
+        retry
       end
     end
 
@@ -340,7 +345,6 @@ module Amiral
     end
 
     def send_payload type, response
-      puts "response: #{response}"
       uuid = response[:in_reply_to]
       response[:hostname] = @settings[:hostname]
       prefix = @settings[:prefix]
@@ -348,69 +352,4 @@ module Amiral
     end
   end
 
-  class Controller
-    include Message
-
-    def initialize settings
-      @settings = {
-        :redis => Redis.new,
-        :prefix => "amiral:",
-        :ack_timeout => 2,
-        :response_timeout => 5,
-        :match_spec => {:all => true},
-        :keytype => :dss,
-      }.merge settings
-
-      raise "need key path" unless @settings[:keypath]
-
-      @privkey = File.open @settings[:keypath] do |file| 
-        KEYTYPES[@settings[:keytype]].new file
-      end
-
-      @redis = @settings[:redis]
-    end
-
-    def run args
-      provider = args.shift
-      request provider, {}
-    end
-
-    def request provider, args
-
-      uuid = uuidgen
-      request = {
-        :command => {
-          :provider => provider,
-          :args => args
-        },
-        :reply_to => uuid,
-        :match => @settings[:match_spec]
-      }
-      
-      @redis.publish @settings[:exchange], serialize(request)
-
-      # pop items for 2 seconds
-      acks = {}
-      resps = {}
-      puts "accepting acknowledgements for #{@settings[:ack_timeout]} seconds"
-      limit = timestamp + @settings[:ack_timeout]
-
-      ## XXX: broken for now
-      @responses = []
-
-      puts "got #{@responses.length}/#{pos_acks.length} responses"
-      @responses
-    end
-
-    def show
-      @responses.map do |node|
-        if node['output']['exit'] == 0
-          printf "%20s: %s\n", node['hostname'], node['output']['short']
-        else
-          printf "%20s: failed!\n", node['hostname']
-          ap node
-        end
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amiral
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis