robot-controller 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4d443e3266f6f9ddc29eca4ca918766386ee951
-  data.tar.gz: ae62b3f2ca4b59661636a2edbd8a6f9af53da184
+  metadata.gz: 803c5e4fa8d9c371645a0f74b54c2a5b65af9e40
+  data.tar.gz: 4f07045008301e932fba0f15fa01a1a265bbb876
 SHA512:
-  metadata.gz: 445ffbb9be84122c5de5d2e8e07b5f5f1c7b2e5231b75b59899503d3c852d0a64babac3a872e7f20d41b6a9734b22b3985c4d132f28345a7e4afce24878ada0f
-  data.tar.gz: d94f0dd6985e7aa7adf53ff2db612ba77b8f770c927b59d2d067ce65c550554b842ed4cb10bab3715f6b2c9d9e8fcbd6413fad9db9714c70802e9584764ea7a1
+  metadata.gz: 55669aa02a47f94fa2799e3207f7fb4f92a0e4e09a089b7fe21d9d39d0d597252b2c2676005ebca157325ab7d1331a1ed5d22dd21969ebbf2086b8b8e70b7002
+  data.tar.gz: 6d89ff076d45d76d4c675a90fc7ec62d279e91f75ad706a93f8c46e921f4a67f2396bb48fc797a516798819d7f218987acf9cdcc29e30d6551753b570636f204

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/robot-controller/bluepill.rb

@@ -15,69 +15,72 @@ Bluepill.application File.basename(File.dirname(File.dirname(WORKDIR))),
   :log_file => "#{WORKDIR}/log/bluepill.log" do |app|
   app.working_dir = WORKDIR
   ROBOTS.each_index do |i|    
-    # prefix process name with index number to prevent duplicate process names
-    prefix = sprintf("robot%02d", i+1)
-    app.process("#{prefix}_#{ROBOTS[i][:robot]}") do |process|
-      puts "Creating robot #{process.name}"
+    ROBOTS[i][:n].to_i.times do |j|
+      # prefix process name with index number to prevent duplicate process names
+      prefix = sprintf("robot%02d_%02d", i+1, j+1)
+      app.process("#{prefix}_#{ROBOTS[i][:robot]}") do |process|
+        puts "Creating robot #{process.name}"
 
-      # queue order is *VERY* important
-      queues = ROBOTS[i][:queues].join(',')
+        # queue order is *VERY* important
+        queues = ROBOTS[i][:queues].join(',')
 
-      # use environment for these resque variables
-      process.environment = {
-        'QUEUES' => queues,
-        'ROBOT_ENVIRONMENT' => robot_environment
-      }
-      process.environment['VERBOSE'] = 'yes' if ENV['ROBOT_VERBOSE'] == 'yes'
+        # use environment for these resque variables
+        process.environment = {
+          'QUEUES' => queues,
+          'ROBOT_ENVIRONMENT' => robot_environment,
+          'INTERVAL' => '5'
+        }
+        process.environment['VERBOSE'] = 'yes' if ENV['ROBOT_VERBOSE'] == 'yes'
+        process.environment['VVERBOSE'] = 'yes' if ENV['ROBOT_VVERBOSE'] == 'yes'
+        
+        # process configuration
+        process.group = robot_environment
+        process.stdout = process.stderr = "#{WORKDIR}/log/#{ROBOTS[i][:robot]}.log"
 
-      # process configuration
-      process.group = robot_environment
-      process.stdout = process.stderr = "#{WORKDIR}/log/#{ROBOTS[i][:robot]}.log"
+        # spawn worker processes using robot-controller
+        process.start_command = "rake environment resque:work"
 
-      # spawn worker processes using robot-controller
-      process.environment['COUNT'] = ROBOTS[i][:n]
-      process.start_command = "rake workers"
+        # we use bluepill to daemonize the resque workers rather than using
+        # resque's BACKGROUND flag
+        process.daemonize = true
 
-      # we use bluepill to daemonize the resque workers rather than using
-      # resque's BACKGROUND flag
-      process.daemonize = true
+        # bluepill manages pid files
+        # process.pid_file = "#{WORKDIR}/run/#{process.name}.pid"
 
-      # bluepill manages pid files
-      # process.pid_file = "#{WORKDIR}/run/#{process.name}.pid"
+        # graceful stops
+        process.stop_grace_time = 360.seconds # must be greater than stop_signals total
+        process.stop_signals = [
+          :quit, 300.seconds, # waits for jobs, then exits gracefully
+          :term, 10.seconds,  # kills jobs and exits
+          :kill               # no mercy
+        ]
 
-      # graceful stops
-      process.stop_grace_time = 360.seconds # must be greater than stop_signals total
-      process.stop_signals = [
-        :quit, 300.seconds, # waits for jobs, then exits gracefully
-        :term, 10.seconds,  # kills jobs and exits
-        :kill               # no mercy
-      ]
+        # process monitoring
 
-      # process monitoring
+        # backoff if process is flapping between states
+        # process.checks :flapping,
+        #                :times => 2, :within => 30.seconds,
+        #                :retry_in => 7.seconds
 
-      # backoff if process is flapping between states
-      # process.checks :flapping,
-      #                :times => 2, :within => 30.seconds,
-      #                :retry_in => 7.seconds
+        # restart if process runs for longer than 15 mins of CPU time
+        # process.checks :running_time,
+        #                :every => 5.minutes, :below => 15.minutes
 
-      # restart if process runs for longer than 15 mins of CPU time
-      # process.checks :running_time,
-      #                :every => 5.minutes, :below => 15.minutes
+        # restart if CPU usage > 75% for 3 times, check every 10 seconds
+        # process.checks :cpu_usage,
+        #                :every => 10.seconds,
+        #                :below => 75, :times => 3,
+        #                :include_children => true
+        #
+        # restart the process or any of its children
+        # if MEM usage > 100MB for 3 times, check every 10 seconds
+        # process.checks :mem_usage,
+        #                :every => 10.seconds,
+        #                :below => 100.megabytes, :times => 3,
+        #                :include_children => true
 
-      # restart if CPU usage > 75% for 3 times, check every 10 seconds
-      # process.checks :cpu_usage,
-      #                :every => 10.seconds,
-      #                :below => 75, :times => 3,
-      #                :include_children => true
-      #
-      # restart the process or any of its children
-      # if MEM usage > 100MB for 3 times, check every 10 seconds
-      # process.checks :mem_usage,
-      #                :every => 10.seconds,
-      #                :below => 100.megabytes, :times => 3,
-      #                :include_children => true
-
-      # NOTE: there is an implicit process.keepalive
+        # NOTE: there is an implicit process.keepalive
+      end
     end
   end
 end

data/lib/robot-controller/tasks.rb

@@ -1,12 +1 @@
-require 'resque/tasks'
-
-desc "Start multiple Resque workers using environment"
-task :workers => [ :environment ] do
-  threads = []
-  (ENV['COUNT'] || '1').to_i.times do
-    threads << Thread.new do
-      system "rake environment resque:work" # XXX is better way to do this?
-    end
-  end
-  threads.each { |thread| thread.join }
-end
+require 'resque/tasks'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robot-controller
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Darren Hardy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bluepill