daemonizer 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/daemonizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemonizer}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-07-12}
+  s.date = %q{2010-07-13}
   s.default_executable = %q{daemonizer}
   s.description = %q{Inspired by bundler and rack. Mostly built on top of Alexey Kovyrin's loops code. http://github.com/kovyrin/loops}
   s.email = %q{glebpom@gmail.com}

data/lib/daemonizer.rb

@@ -13,9 +13,45 @@ module Daemonizer
   end
 
   def self.root
-    @@root
+    if defined?(@@root)
+      @@root
+    else
+      File.dirname(demfile)
+    end
+  end
+  
+  def self.demfile=(demfile_name)
+    @@demfile = File.expand_path(demfile_name)
+    @@demfile
+  end
+  
+  def self.demfile
+    if defined?(@@demfile)
+      @@demfile
+    else
+      "Demfile"
+    end
   end
 
+  def self.[](pool)
+    find_pools(pool).first or nil
+  end
+  
+  def self.find_pools(pool_name = nil)    
+    pools = Dsl.evaluate(demfile)
+
+    if pool_name
+      if pool = pools[pool_name.to_sym]
+        [pool]
+      else
+        puts "#{pool_name} is not configured"
+        []
+      end
+    else
+      pools.values
+    end
+  end
+  
 end
 
 require File.dirname(__FILE__) + '/../lib/daemonizer/autoload'

data/lib/daemonizer/cli.rb

@@ -5,14 +5,16 @@ module Daemonizer
   class CLI < Thor
     check_unknown_options!
 
+    method_option :demfile, :type => :string, :aliases => "-D", :banner => "Path to Demfile"
+
     def initialize(*)
       super
+      Daemonizer.demfile = options[:demfile] || "Demfile"
     end
                 
     desc "start", "Start pool"
-    method_option :demfile, :type => :string, :aliases => "-D", :banner => "Path to Demfile"
     def start(pool_name = nil)
-      control_pools_loop(pool_name, "successfully started", options[:demfile]) do |pool|
+      control_pools_loop(pool_name, "successfully started") do |pool|
         # Pid file check
         if Daemonize.check_pid(pool.pid_file)
           print_pool pool.name,  "Can't start, another process exists!"
@@ -41,9 +43,8 @@ module Daemonizer
     end
     
     desc "stop", "Stop pool"
-    method_option :demfile, :type => :string, :aliases => "-D", :banner => "Path to Demfile"
     def stop(pool_name = nil)
-      control_pools_loop(pool_name, "successfully stoped", options[:demfile]) do |pool|
+      control_pools_loop(pool_name, "successfully stoped") do |pool|
         STDOUT.sync = true
         unless Daemonize.check_pid(pool.pid_file)
           print_pool pool.name, "No pid file or a stale pid file!"
@@ -65,18 +66,28 @@ module Daemonizer
       return true
     end
 
+    desc "list", "List of pools"
+    def list
+      puts "List of configured pools:"
+      puts "" 
+      Daemonizer.find_pools(nil).each do |pool|
+        puts "  * #{pool.name}" 
+      end
+      puts ""
+      return true
+    end
+
+
     desc "restart", "Restart pool"
-    method_option :demfile, :type => :string, :aliases => "-D", :banner => "Path to Demfile"
     def restart(pool_name = nil)
       invoke :stop, pool_name
       invoke :start, pool_name
     end
 
     desc "debug", "Debug pool (do not demonize)"
-    method_option :demfile, :type => :string, :aliases => "-D", :banner => "Path to Demfile"
     def debug(pool_name = nil)
       puts "You should supply pool_name to debug" if pool_name.nil?
-      control_pools_loop(pool_name, "execution ended", options[:demfile]) do |pool|
+      control_pools_loop(pool_name, "execution ended") do |pool|
         STDOUT.sync = true
         print_pool pool.name,  "Debugging pool: "
         
@@ -90,8 +101,8 @@ module Daemonizer
     end
     
   private
-    def control_pools_loop(pool_name, message = nil, demfile = nil, &block)
-      find_pools(pool_name, demfile).each do |pool|
+    def control_pools_loop(pool_name, message = nil, &block)
+      Daemonizer.find_pools(pool_name).each do |pool|
         Process.fork do
           yield(pool)
         end
@@ -102,25 +113,6 @@ module Daemonizer
       end
     end
     
-    def find_pools(pool_name, demfile)
-      demfile_name = demfile || "Demfile"
-      
-      Daemonizer.root = File.dirname(File.expand_path(demfile_name))
-      
-      pools = Dsl.evaluate(demfile_name)
-      
-      if pool_name
-        if pool = pools[pool_name.to_sym]
-          [pool]
-        else
-          print_pool pool_name,  "pool is not configured"
-          []
-        end
-      else
-        pools.values
-      end
-    end
-    
     def print_pool(pool_name, message)
       puts "#{pool_name}: #{message}"
     end

data/lib/daemonizer/config.rb

@@ -8,10 +8,17 @@ module Daemonizer
       @pool = pool
       @options = options
       init_defaults
-      init_logger
       validate
       initialize_handler
     end
+    
+    def option(key)
+      if handler
+        handler.option(key) 
+      else
+        raise ConfigError, "handler is not initialized"
+      end
+    end
 
     def initialize_handler
       if @options[:after_init]
@@ -23,15 +30,6 @@ module Daemonizer
       @handler.logger = @logger
     end
 
-    def init_logger
-      @logger = Logger.new @pool.to_s
-      outputter = FileOutputter.new('log', :filename => self.log_file)
-      outputter.formatter = PatternFormatter.new :pattern => "%d - %l %g - %m"
-      @logger.outputters = outputter
-      @logger.level = INFO
-      GDC.set "#{Process.pid}/monitor"
-    end
-
     def init_defaults
       @options[:before_init] ||= nil
       @options[:after_init] ||= nil
@@ -78,10 +76,6 @@ module Daemonizer
     def name
       @pool
     end
-    
-    def logger
-      @logger
-    end
   end
 
 end

data/lib/daemonizer/engine.rb

@@ -1,13 +1,16 @@
 module Daemonizer
   class Engine
     attr_reader :config
+    attr_reader :logger
 
     def initialize(config, debug = false)
       @config = config
-    end
-    
-    def logger
-      @config.logger
+      @logger = Logger.new @config.name.to_s
+      outputter = FileOutputter.new('log', :filename => self.log_file)
+      outputter.formatter = PatternFormatter.new :pattern => "%d - %l %g - %m"
+      @logger.outputters = outputter
+      @logger.level = INFO
+      GDC.set "#{Process.pid}/monitor"
     end
 
     def start!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +04:00
+date: 2010-07-13 00:00:00 +04:00
 default_executable: daemonizer
 dependencies: 
 - !ruby/object:Gem::Dependency