loops 2.0.6 → 2.0.7

data/README.rdoc

@@ -35,26 +35,18 @@ you're going to like it.
 
 == How to install?
 
-There are two options when approaching db-charmer installation:
+Add the loops gem to your +Gemfile+:
 
-* using the gem (recommended)
-* install as a Rails plugin
+    gem 'loops'
 
-To install as a gem, add this to your environment.rb:
+And then run +bundle+ command.
 
-    config.gem 'loops'
-
-And then run the command:
-
-    sudo rake gems:install
-
-To install loops as a Rails plugin you need to do rhw following:
+To install loops as a Rails plugin you need to do the following:
 
     ./script/plugin install git://github.com/kovyrin/loops.git
 
-This will install the whole package in your vendor/plugins directory.
-For merb applications, just check out the code and place it to the vendor/plugins directory.
-
+This will install the whole package in your +vendor/plugins+ directory.
+For merb applications, just check out the code and place it to the +vendor/plugins+ directory.
 
 After you are done with the installation, you need to generate binary and configuration
 files by running:
@@ -62,10 +54,10 @@ files by running:
     ./script/generate loops
 
 This will create the following list of files:
-* <tt>./script/loops</tt> - binary file that will be used to manage your loops
-* <tt>./config/loops.yml</tt> - example configuration file
-* <tt>./app/loops/simple.rb</tt> - REALLY simple loop example
-* <tt>./app/loops/queue_loop.rb</tt> - simple ActiveMQ queue worker
+* <tt>./script/loops</tt> -- binary file that will be used to manage your loops
+* <tt>./config/loops.yml</tt> -- example configuration file
+* <tt>./app/loops/simple.rb</tt> -- REALLY simple loop example
+* <tt>./app/loops/queue_loop.rb</tt> -- simple ActiveMQ queue worker
 
 
 == How to use?
@@ -177,12 +169,18 @@ initialize_loop raises an error, then the loop is not started and the error is l
 
 We use monit to keep loop monitors runnings. You could use something like this in your configs:
 
+    check process loop-slow_logs with pidfile /your/project/current/tmp/pids/loop-slow_logs.pid
+      group loops
+      start program "/bin/bash -c 'cd /your/project/current && /usr/bin/bundle exec loops start slow_logs -p /your/project/shared/pids/loop-slow_logs.pid -e loops -d'"
+      stop  program "/bin/bash -c 'cd /your/project/current && /usr/bin/bundle exec loops stop -p /your/project/shared/pids/loop-slow_logs.pid'"
+
+If you do not use bundler, you can do:
+
     check process loop-slow_logs with pidfile /your/project/current/tmp/pids/loop-slow_logs.pid
       group loops
       start program "/your/project/current/script/loops start slow_logs -e loops -p tmp/pids/loop-slow_logs.pid -d"
       stop  program "/your/project/current/script/loops stop  slow_logs -e loops -p tmp/pids/loop-slow_logs.pid"
 
-
 == ActiveMQ-based workers? What's that?
 
 In some of our worker loops we poll ActiveMQ queue and process its items to perform some

data/lib/loops/engine.rb

@@ -172,6 +172,9 @@ class Loops::Engine
       if config['debug_loop']
         loop_proc.call
       else
+        # If wait_period is specified for the loop, update ProcessManager's
+        # setting.
+        @pm.update_wait_period(config['wait_period']) if config['wait_period']
         @pm.start_workers(name, config['workers_number'] || 1) { loop_proc.call }
       end
     end
@@ -205,9 +208,9 @@ class Loops::Engine
 
     def fix_ar_after_fork
       if Object.const_defined?('ActiveRecord')
-        if Rails::VERSION::MAJOR < 3
+        if ActiveRecord::VERSION::MAJOR < 3
           ActiveRecord::Base.allow_concurrency = true
-        else
+        elsif Object.const_defined?('Rails')
           Rails.application.config.allow_concurrency = true
         end
         ActiveRecord::Base.clear_active_connections!

data/lib/loops/process_manager.rb

@@ -5,7 +5,8 @@ module Loops
     def initialize(config, logger)
       @config = {
         'poll_period' => 1,
-        'workers_engine' => 'fork'
+        'wait_period' => 10,
+        'workers_engine' => 'fork',
       }.merge(config)
 
       @logger = logger
@@ -13,6 +14,11 @@ module Loops
       @shutdown = false
     end
 
+    def update_wait_period(period)
+      return unless period
+      @config['wait_period'] = [@config['wait_period'], period].max
+    end
+
     def start_workers(name, number, &blk)
       raise ArgumentError, "Need a worker block!" unless block_given?
 
@@ -42,7 +48,7 @@ module Loops
       stop_workers(false)
 
       # Wait for all the workers to die
-      unless wait_for_workers(10)
+      unless wait_for_workers(@config['wait_period'])
         logger.info("Some workers are still alive after 10 seconds of waiting. Killing them...")
         stop_workers(true)
         wait_for_workers(5)

data/lib/loops/version.rb

@@ -4,5 +4,5 @@
 #   puts "Loops #{Loops::VERSION}"
 #
 module Loops
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loops
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 -04:00
-default_executable: 
+date: 2011-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -108,7 +107,6 @@ files:
 - spec/rails/config/init.rb
 - spec/rails/config/loops.yml
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kovyrin/loops
 licenses: []
 
@@ -138,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Simple background loops framework for ruby