radagast 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 560f233b948a123e0fb646dceeb36fcb04d59e70
-  data.tar.gz: 708db7870f7d5d310bc9075bd5a410d2e3892b1c
+  metadata.gz: 3a3aeecf960c69e2b139b0c8a3768ea662617742
+  data.tar.gz: f822537df36098ae47ee5b887375bbbce4273e1d
 SHA512:
-  metadata.gz: 625289d4021c881f27e268fe41f202e02bddb279bb9cbdf7426444440382bc28d7f14964074c3d7811120b1e1bcfeb86ed46951d41fe378af41876017c9197b2
-  data.tar.gz: bcdd6fabb52f4dee4e4fa2aeae653ca6059554011cc41f410ced512b9d4ebb141012e98117b378b3b9be92eea7e2717bf270f3c1def0403f85857bfd8e2c70ae
+  metadata.gz: 500012876ff082a92f70ffe389fc0a4f4cb033842d5be517b5cdd2c7e02dcdb9a24d3cb174c1ae4938ceb6e859b6085cdac947fb1340baacfa348c8228f27c0c
+  data.tar.gz: 2637232e4857d35172b31a7a178f8d9dc84153c4cd805bddb65bb170bf75688029b80cbe7666526aa2f3783e3f512bec51f79eb92c49cf262d512ed364cb438f

data/lib/radagast/config.rb

@@ -2,11 +2,12 @@ require 'optparse'
 require 'logger'
 
 module Radagast
-  Config = Struct.new(:key, :rabbit, :log_level) do
+  Config = Struct.new(:key, :rabbit, :log_level, :log_file) do
     def initialize
       self.key = 'default'
       self.rabbit = 'amqp://guest:guest@127.0.0.1:5672'
-      self.log_level = Logger::UNKNOWN
+      self.log_level = Logger::INFO
+      self.log_file = STDOUT
     end
 
     def self.parse_argv(argv = ARGV)
@@ -15,6 +16,7 @@ module Radagast
         opt.on('--key KEY') { |o| config.key = o }
         opt.on('--rabbit RABBIT') { |o| config.rabbit = o }
         opt.on('--log_level LOG_LEVEL') { |o| config.log_level = const_get(o) }
+        opt.on('--log_file LOG_FILE') { |o| config.log_file = o }
       end.parse!(argv)
       config
     end

data/lib/radagast/manager.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 require_relative 'config'
 require_relative 'rabbit_helper'
 require_relative 'result'
@@ -5,7 +7,7 @@ require_relative 'result'
 module Radagast
   # Dispatches tasks and aggregates the results
   class Manager < RabbitHelper
-    def initialize(config)
+    def initialize(config = Radagast::Config.new)
       super(
         queue_name: "results-#{config.key}",
         routing_key: "tasks-#{config.key}",
@@ -17,21 +19,12 @@ module Radagast
       @all_results = []
     end
 
-    def task(cmd, &blk)
+    def task(cmd, meta = {}, &blk)
       logger.info 'Publishing task'
       @published_cnt += 1
-      @callbacks[cmd] = blk
-      publish(cmd: cmd)
-    end
-
-    def process_callback(data)
-      logger.info "Result #{@processed_cnt}/#{@published_cnt} is here: #{data}"
-      result = Result.new
-      result.exit_code = data['exitstatus']
-      result.stderr = data['stderr'].strip
-      result.stdout = data['stdout'].strip
-      result.meta = { cmd: data['cmd'] }
-      @callbacks[data['cmd']].call result
+      task_id = SecureRandom.uuid
+      @callbacks[task_id] = blk if block_given?
+      publish(cmd: cmd, meta: meta, task_id: task_id)
     end
 
     def finish
@@ -45,8 +38,9 @@ module Radagast
         logger.info 'Manager subscribe to results queue'
         subscribe do |data|
           @processed_cnt += 1
-          process_callback data
-          @all_results << data
+          result = Result.from_hash data
+          process_callback result
+          @all_results << result
           if @processed_cnt == @published_cnt
             logger.info "All #{@processed_cnt} messages have been processed"
             cleanup
@@ -54,5 +48,12 @@ module Radagast
         end
       end
     end
+
+    private
+
+    def process_callback(result)
+      logger.info "Result #{@processed_cnt}/#{@published_cnt} : #{result}"
+      @callbacks[result.task_id].call(result) if @callbacks.key? result.task_id
+    end
   end
 end

data/lib/radagast/rabbit_helper.rb

@@ -14,7 +14,7 @@ module Radagast
       @channel = @rabbit.create_channel
       @exchange = @channel.default_exchange
       @queue = @channel.queue(queue_name, auto_delete: true)
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new(config.log_file)
       @logger.level = config.log_level
     end
 

data/lib/radagast/result.rb

@@ -1,3 +1,13 @@
 module Radagast
-  Result = Struct.new(:exit_code, :stdout, :stderr, :meta)
+  Result = Struct.new(:exit_code, :stdout, :stderr, :meta, :task_id) do
+    def self.from_hash(data)
+      o = new
+      o.exit_code = data['exit_code']
+      o.stderr = data['stderr']
+      o.stdout = data['stdout']
+      o.meta = data['meta']
+      o.task_id = data['task_id']
+      o
+    end
+  end
 end

data/lib/radagast/worker.rb

@@ -7,7 +7,7 @@ require_relative 'rabbit_helper'
 module Radagast
   # Fetches the task, processes it and returns the result
   class Worker < RabbitHelper
-    def initialize(config)
+    def initialize(config = Radagast::Config.new)
       super(
         queue_name: "tasks-#{config.key}",
         routing_key: "results-#{config.key}",
@@ -16,15 +16,15 @@ module Radagast
     end
 
     def start
-      logger.info 'Worker setup, subscribing to tasks queue'
+      logger.info "Worker setup, subscribing to tasks queue #{@queue.name}"
       subscribe do |data|
         stdout, stderr, status = Open3.capture3(data['cmd'])
         response = {
-          cmd: data['cmd'],
-          meta: data['meta'],
-          stdout: stdout,
-          stderr: stderr,
-          exitstatus: status.exitstatus
+          task_id: data['task_id'],
+          meta: data['meta'].merge(cmd: data['cmd']),
+          stdout: stdout.strip,
+          stderr: stderr.strip,
+          exit_code: status.exitstatus
         }
         publish(response)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radagast
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Bartek Wilczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="