daemonizer 0.3.8 → 0.3.9

data/Rakefile

@@ -10,7 +10,6 @@ begin
     gemspec.email = "glebpom@gmail.com"
     gemspec.homepage = "http://github.com/glebpom/daemonizer"
     gemspec.authors = ["Gleb Pomykalov"]
-    gemspec.add_dependency('log4r', '>= 1.1.8')
     gemspec.add_dependency('thor', '>= 0.13.7')
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/daemonizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemonizer}
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-07-15}
+  s.date = %q{2010-07-16}
   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}
@@ -51,14 +51,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<log4r>, [">= 1.1.8"])
       s.add_runtime_dependency(%q<thor>, [">= 0.13.7"])
     else
-      s.add_dependency(%q<log4r>, [">= 1.1.8"])
       s.add_dependency(%q<thor>, [">= 0.13.7"])
     end
   else
-    s.add_dependency(%q<log4r>, [">= 1.1.8"])
     s.add_dependency(%q<thor>, [">= 0.13.7"])
   end
 end

data/lib/daemonizer.rb

@@ -2,9 +2,7 @@ require 'rubygems'
 require 'yaml'
 require 'erb'
 require 'pathname'
-require 'log4r'
-
-include Log4r
+require 'logger'
 
 module Daemonizer
   
@@ -33,36 +31,39 @@ module Daemonizer
     end
   end
   
+  def self.logger_context=(str)
+    @@logger_context = str
+  end
+  
+  def self.logger_context
+    @@logger_context
+  end
+  
   def self.init_logger(name, log_file)
-    @@logger = Logger.new name
-    outputter = FileOutputter.new('log', :filename => log_file, :trunc => false)
-    outputter.formatter = PatternFormatter.new :pattern => "%d - %l %g - %m"
-    @@logger.outputters = outputter
-    @@logger.level = INFO
+    @@logger_file = File.open(log_file, File::WRONLY | File::APPEND)
+    @@logger = Logger.new(@@logger_file)
+    set_logger_common_options
   end
   
-  def self.reopen_log_file
-    log_file = @@logger.outputters.first.filename
-    @@logger.outputters.each do |o|
-      o.flush
-      o.close
+  def self.set_logger_common_options
+    @@logger.sev_threshold = Logger::INFO
+    @@logger.formatter = Proc.new do |severity, datetime, progname, msg|
+      "%s %s -- %s -- %s\n" % [ datetime.strftime("%Y-%m-%d %H:%M:%S"), severity, Daemonizer.logger_context, msg ]
     end
-    outputter = FileOutputter.new('forked-log', :filename => log_file, :trunc => false)
-    outputter.formatter = PatternFormatter.new :pattern => "%d - %l %g - %m"
-    @@logger.outputters = outputter
+  end
+  
+  def self.reopen_log_file
+    true #do not need it in append-only mode
   end
   
   def self.flush_logger
-    @@logger.outputters.each do |o| 
-      o.flush
-    end
+    @@logger_file.flush
   end
   
   def self.init_console_logger(name)
-    @@logger = Logger.new name
-    outputter = Outputter.stdout
-    outputter.formatter = PatternFormatter.new :pattern => "%d - %l %g - %m"
-    @@logger.outputters = outputter
+    @@logger_file = STDOUT
+    @@logger = Logger.new(@@logger_file)
+    set_logger_common_options
   end
   
   def self.logger

data/lib/daemonizer/config.rb

@@ -47,6 +47,22 @@ module Daemonizer
         raise ConfigError, "start should be set" if @options[:start].nil?
         raise ConfigError, "start should have block" unless @options[:start].is_a?(Proc)
       end
+      
+      # file validation
+      if File.exist?(self.log_file)
+        if !File.file?(self.log_file)
+          raise ConfigError, "'#{self.log_file}' is not a regular file"
+        elsif !File.writable?(self.log_file)
+          raise ConfigError, "'#{self.log_file}' is not writable!"
+        end
+      else # ensure directory is writable
+        dir = File.dirname(self.log_file)
+        if not File.writable?(dir)
+          raise ConfigError, "'#{dir}' is not writable!"
+        end
+        File.open(self.log_file, 'w') { |f| f.write('') } #creating empty file
+      end
+      
     end
 
     [:workers, :poll_period, :root, :cow_friendly].each do |method|

data/lib/daemonizer/engine.rb

@@ -4,7 +4,7 @@ module Daemonizer
 
     def initialize(config, debug = false)
       @config = config
-      GDC.set "#{Process.pid}/monitor"
+      Daemonizer.logger_context = "#{Process.pid}/monitor"
     end
     
     def start!

data/lib/daemonizer/worker.rb

@@ -29,7 +29,7 @@ module Daemonizer
         
         @pid = Process.pid
         Daemonizer.reopen_log_file
-        GDC.set "#{@pid}/#{@worker_id}"
+        Daemonizer.logger_context = "#{@pid}/#{@worker_id}"
         
         Daemonizer.logger.info "Log file reopened after fork"
         normal_exit = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,29 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +04:00
+date: 2010-07-16 00:00:00 +04:00
 default_executable: daemonizer
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: log4r
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 1
-        - 8
-        version: 1.1.8
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,7 +33,7 @@ dependencies:
         - 7
         version: 0.13.7
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 description: Inspired by bundler and rack. Mostly built on top of Alexey Kovyrin's loops code. http://github.com/kovyrin/loops
 email: glebpom@gmail.com
 executables: