loops 2.0.1 → 2.0.2

data/README.rdoc

@@ -217,6 +217,27 @@ not support demonization in JRuby and never tested the code on Ruby 1.9. Obvious
 of JVM limitations you won't be able to use <tt>fork</tt> workers engine in JRuby, but
 threaded workers do pretty well.
 
+Recommended version of ruby ro run loops is Ruby Enterprise Edition. This is because we
+have a support for their Copy-On-Write friendly garbage collector that makes your loops
+much smaller in memory (since they share the most of the code). Even with one loop process
+you'd save some memory because your loop monitor process would share most of the memory with
+the loop itself. When you run on RubyEE, you could use <tt>loops stats</tt> command to get
+detailed loops memory stats:
+
+        [root@analyics current]# ./script/loops stats
+
+        --------- Loops processes ----------
+        PID   PPID  VMSize    Private  Name
+        ------------------------------------
+        9062  1     199.3 MB  32.4 MB  loops monitor: activemq
+        9234  9062  211.9 MB  37.5 MB  loop worker: activemq
+        9251  9062  213.3 MB  38.4 MB  loop worker: activemq
+        9267  9062  211.9 MB  37.1 MB  loop worker: activemq
+        9268  9062  211.9 MB  38.0 MB  loop worker: activemq
+        ### Processes: 5
+        ### Total private dirty RSS: 183.33 MB
+
+
 
 == Migrating from pre-2.0 releases
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 1
-:major: 2
 :minor: 0
 :build: 
+:patch: 2
+:major: 2

data/lib/loops/cli/commands.rb

@@ -81,12 +81,7 @@ module Loops
       # Finds, instantiates and invokes a command.
       #
       def run!
-        if cmd = find_command(options[:command])
-          cmd.invoke(engine, options)
-        else
-          STDERR << option_parser
-          exit
-        end
+        @command.invoke(engine, options)
       end
 
       # Find and return an instance of {Command} by command name.

data/lib/loops/cli/options.rb

@@ -129,11 +129,8 @@ module Loops
         # Loops root
         Loops.loops_root  = options.delete(:loops_root)
 
-        extract_command!
-        if options[:command].nil? || options[:command] == 'help'
-          puts option_parser
-          exit
-        end
+        @command = extract_command!
+        options[:framework] = 'none' unless @command.requires_bootstrap?
 
         bootstrap!
         start_engine!
@@ -154,7 +151,16 @@ module Loops
       #
       def extract_command!
         options[:command], *options[:args] = args
-        options[:command]
+        if options[:command].nil? || options[:command] == 'help'
+          puts option_parser
+          exit
+        end
+
+        unless command = find_command(options[:command])
+          STDERR << option_parser
+          exit
+        end
+        command
       end
 
       # Detect the application root directory (contatining "app"

data/lib/loops/command.rb

@@ -29,6 +29,11 @@ class Loops::Command
   def execute
     raise 'Generic command has no actions'
   end
+
+  # Gets a value indicating whether command needs to bootstrap framework.
+  def requires_bootstrap?
+    true
+  end
 end
 
 # All Loops command registered.

data/lib/loops/commands/list_command.rb

@@ -8,4 +8,8 @@ class Loops::Commands::ListCommand < Loops::Command
       end
     end
   end
+
+  def requires_bootstrap?
+    false
+  end
 end

data/lib/loops/commands/stats_command.rb

@@ -2,4 +2,8 @@ class Loops::Commands::StatsCommand < Loops::Command
   def execute
     system File.join(Loops::LIB_ROOT, '../bin/loops-memory-stats')
   end
+
+  def requires_bootstrap?
+    false
+  end
 end

data/lib/loops/commands/stop_command.rb

@@ -15,4 +15,8 @@ class Loops::Commands::StopCommand < Loops::Command
     puts " Done!"
     exit(0)
   end
+
+  def requires_bootstrap?
+    false
+  end
 end

data/lib/loops/engine.rb

@@ -181,20 +181,14 @@ class Loops::Engine
     end
 
     def setup_signals
-      trap('TERM') {
-        warn "Received a TERM signal... stopping..."
-        @pm.stop_workers!
+      stop = proc {
+        warn "Received a signal... stopping..."
+        @pm.start_shutdown!
       }
 
-      trap('INT') {
-        warn "Received an INT signal... stopping..."
-        @pm.stop_workers!
-      }
-
-      trap('EXIT') {
-        warn "Received a EXIT 'signal'... stopping..."
-        @pm.stop_workers!
-      }
+      trap('TERM', stop)
+      trap('INT', stop)
+      trap('EXIT', stop)
     end
 
     def fix_ar_after_fork

data/lib/loops/process_manager.rb

@@ -37,6 +37,11 @@ module Loops
         sleep(@config['poll_period'])
       end
     ensure
+      logger.info("Workers monitoring loop is finished, starting shutdown...")
+      # Send out stop signals
+      stop_workers(false)
+
+      # Wait for all the workers to die
       unless wait_for_workers(10)
         logger.info("Some workers are still alive after 10 seconds of waiting. Killing them...")
         stop_workers(true)
@@ -72,12 +77,8 @@ module Loops
     end
 
     def stop_workers(force = false)
-      # Return if already shuting down (and not forced to stop)
-      return if shutdown? && !force
-
       # Set shutdown flag
       logger.info("Stopping workers#{force ? ' (forced)' : ''}...")
-      start_shutdown!
 
       # Termination loop
       @worker_pools.each do |name, pool|
@@ -85,23 +86,6 @@ module Loops
       end
     end
 
-    def stop_workers!
-      # return if already shutting down
-      return if shutdown?
-
-      # Set shutdown flag
-      start_shutdown!
-
-      # Ask gently to stop
-      stop_workers(false)
-
-      # Give it a second
-      sleep(1)
-
-      # Forcefully stop the workers
-      stop_workers(true)
-    end
-
     def shutdown?
       @shutdown
     end

data/loops.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loops}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin", "Dmytro Shteflyuk"]
-  s.date = %q{2010-03-19}
+  s.date = %q{2010-03-31}
   s.description = %q{Loops is a small and lightweight framework for Ruby on Rails, Merb and other ruby frameworks created to support simple background loops in your application which are usually used to do some background data processing on your servers (queue workers, batch tasks processors, etc).}
   s.email = %q{alexey@kovyrin.net}
   s.executables = ["loops", "loops-memory-stats"]
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kovyrin/loops}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple background loops framework for ruby}
   s.test_files = [
     "spec/loop_lock_spec.rb",

data/spec/rails/app/loops/complex_loop.rb

@@ -1,6 +1,6 @@
 class ComplexLoop < Loops::Base
   def run
-    with_period_of(1.second) do
+    with_period_of(1) do
       if shutdown?
         info("Shutting down!")
         return # exit the loop

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: loops
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -04:00
+date: 2010-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -91,20 +86,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Simple background loops framework for ruby