daemon-kit 0.1.8pre → 0.1.8rc1

data/README.rdoc

@@ -9,7 +9,7 @@
 
 Daemon Kit aims to simplify creating Ruby daemons by providing a sound application skeleton (through a generator), task specific generators (jabber bot, etc) and robust environment management code.
 
-Using simple built-in generators it is easy to created evented and non-evented daemons that perform a multitude of different tasks.
+Using simple built-in generators it is easy to create evented and non-evented daemons that perform a multitude of different tasks.
 
 Supported generators:
 

data/daemon-kit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemon-kit}
-  s.version = "0.1.8pre"
+  s.version = "0.1.8rc1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["kenneth.kalmer@gmail.com"]
-  s.date = %q{2010-02-05}
+  s.date = %q{2010-04-13}
   s.default_executable = %q{daemon-kit}
   s.description = %q{daemon-kit aims to simplify creating Ruby daemons by providing a sound application skeleton (through a generator), task specific generators (jabber bot, etc) and robust environment management code.}
   s.email = %q{kenneth.kalmer@gmail.com}
@@ -138,6 +138,7 @@ Gem::Specification.new do |s|
      "lib/generators/daemon_kit/capistrano/templates/Capfile",
      "lib/generators/daemon_kit/capistrano/templates/USAGE",
      "lib/generators/daemon_kit/capistrano/templates/config/deploy.rb.tt",
+     "lib/generators/daemon_kit/capistrano/templates/config/deploy/logrotate.erb",
      "lib/generators/daemon_kit/capistrano/templates/config/deploy/production.rb.tt",
      "lib/generators/daemon_kit/capistrano/templates/config/deploy/staging.rb.tt",
      "lib/generators/daemon_kit/capistrano/templates/config/environments/staging.rb",

data/lib/daemon_kit/application.rb

@@ -101,6 +101,49 @@ module DaemonKit
       def exit!( code = 0 )
       end
 
+      # http://gist.github.com/304739
+      #
+      # Stolen from Unicorn::Util
+      #
+      # This reopens ALL logfiles in the process that have been rotated
+      # using logrotate(8) (without copytruncate) or similar tools.
+      # A +File+ object is considered for reopening if it is:
+      #   1) opened with the O_APPEND and O_WRONLY flags
+      #   2) opened with an absolute path (starts with "/")
+      #   3) the current open file handle does not match its original open path
+      #   4) unbuffered (as far as userspace buffering goes, not O_SYNC)
+      # Returns the number of files reopened
+      def reopen_logs
+        nr = 0
+        append_flags = File::WRONLY | File::APPEND
+        DaemonKit.logger.info "Rotating logs" if DaemonKit.logger
+
+        #logs = [STDOUT, STDERR]
+        #logs.each do |fp|
+        ObjectSpace.each_object(File) do |fp|
+          next if fp.closed?
+          next unless (fp.sync && fp.path[0..0] == "/")
+          next unless (fp.fcntl(Fcntl::F_GETFL) & append_flags) == append_flags
+
+          begin
+            a, b = fp.stat, File.stat(fp.path)
+            next if a.ino == b.ino && a.dev == b.dev
+          rescue Errno::ENOENT
+          end
+
+          open_arg = 'a'
+          if fp.respond_to?(:external_encoding) && enc = fp.external_encoding
+            open_arg << ":#{enc.to_s}"
+            enc = fp.internal_encoding and open_arg << ":#{enc.to_s}"
+          end
+          DaemonKit.logger.info "Rotating path: #{fp.path}" if DaemonKit.logger
+          fp.reopen(fp.path, open_arg)
+          fp.sync = true
+          nr += 1
+        end # each_object
+        nr
+      end
+
       protected
 
       def parse_arguments( args )

data/lib/daemon_kit/config.rb

@@ -64,7 +64,7 @@ module DaemonKit
         #end
         if @data.respond_to?( method_name.to_s )
           return @data.send( method_name.to_s )
-        elsif @date.respond_to?( method_name.to_s.gsub(/\-/, '_') )
+        elsif @data.respond_to?( method_name.to_s.gsub(/\-/, '_') )
           return @data.send( method_name.to_s.gsub(/\-/, '_') )
         end
       end

data/lib/daemon_kit/initializer.rb

@@ -188,7 +188,7 @@ module DaemonKit
         DaemonKit.logger.info "Log level changed to DEBUG"
       }
       configuration.trap("HUP") {
-        DaemonKit.logger.close
+        DaemonKit::Application.reopen_logs
       }
     end
 

data/lib/daemon_kit/tasks/framework.rake

@@ -13,16 +13,15 @@ namespace :daemon_kit do
       version ||= kit.version
 
       unless kit
-        puts "No daemon_kit gem #{version} is installed.  Do 'gem list daemon_kit' to see what you have available."
+        puts "No daemon_kit gem #{version} is installed.  Do 'gem list daemon-kit' to see what you have available."
         exit
       end
 
       puts "Freezing the gem for DaemonKit #{kit.version}"
-      rm_rf   "vendor/daemon_kit"
-      mkdir_p "vendor/daemon_kit"
+      mkdir_p "vendor"
 
       begin
-        chdir("vendor/daemon_kit") do
+        chdir("vendor") do
           kit.dependencies.select { |g| deps.include? g.name }.each do |g|
             Gem::GemRunner.new.run(["unpack", g.name, "--version", g.version_requirements.to_s])
             mv(Dir.glob("#{g.name}*").first, g.name)
@@ -32,7 +31,7 @@ namespace :daemon_kit do
           FileUtils.mv(Dir.glob("daemon-kit*").first, "daemon-kit")
         end
       rescue Exception
-        rm_rf "vendor/daemon_kit"
+        rm_rf "vendor/daemon-kit"
         raise
       end
     end
@@ -44,10 +43,9 @@ namespace :daemon_kit do
       commits = "http://github.com/api/v1/yaml/kennethkalmer/daemon-kit/commits/master"
       url     = "http://github.com/kennethkalmer/daemon-kit/zipball/master"
 
-      rm_rf   "vendor/daemon_kit"
-      mkdir_p "vendor/daemon_kit"
+      rm_rf   "vendor/daemon-kit"
 
-      chdir 'vendor/daemon_kit' do
+      chdir 'vendor' do
         latest_revision = YAML.load(open(commits))["commits"].first["id"]
 
         puts "Downloading DaemonKit from #{url}"
@@ -120,6 +118,6 @@ namespace :daemon_kit do
 end
 
 def copy_framework_template( *args )
-  src_dir = File.join(DaemonKit.framework_root, 'app_generators', 'daemon_kit', 'templates')
+  src_dir = File.join(DaemonKit.framework_root, 'lib', 'generators', 'daemon_kit', 'app', 'templates')
   cp File.join( src_dir, *args ), File.join( DaemonKit.root, *args )
 end

data/lib/daemon_kit.rb

@@ -13,7 +13,7 @@ $:.unshift( File.dirname(__FILE__).to_absolute_path ) unless
   $:.include?( File.dirname(__FILE__).to_absolute_path )
 
 module DaemonKit
-  VERSION = '0.1.8pre'
+  VERSION = '0.1.8rc1'
 
   autoload :Initializer,    'daemon_kit/initializer'
   autoload :Application,    'daemon_kit/application'

data/lib/generators/daemon_kit/app/templates/Gemfile

@@ -5,4 +5,4 @@
 # daemon-kit
 gem 'daemon-kit'
 
-# For more information on bundler, please visit http://github.com/wycats/bundler
+# For more information on bundler, please visit http://github.com/carlhuda/bundler

data/lib/generators/daemon_kit/app/templates/config/boot.rb

@@ -25,7 +25,7 @@ module DaemonKit
     end
 
     def vendor_kit?
-      File.exists?( "#{DAEMON_ROOT}/vendor/daemon_kit" )
+      File.exists?( "#{DAEMON_ROOT}/vendor/daemon-kit" )
     end
   end
 
@@ -38,7 +38,7 @@ module DaemonKit
 
   class VendorBoot < Boot
     def load_initializer
-      require "#{DAEMON_ROOT}/vendor/daemon_kit/lib/daemon_kit/initializer"
+      require "#{DAEMON_ROOT}/vendor/daemon-kit/lib/daemon_kit/initializer"
     end
   end
 

data/lib/generators/daemon_kit/app/templates/script/destroy

@@ -1,2 +1,3 @@
+#!/usr/bin/env ruby
 require File.expand_path( '../../config/environment', __FILE__ )
 require 'daemon_kit/commands/generate'

data/lib/generators/daemon_kit/app/templates/script/generate

@@ -1,2 +1,3 @@
+#!/usr/bin/env ruby
 require File.expand_path( '../../config/environment', __FILE__ )
 require 'daemon_kit/commands/generate'

data/lib/generators/daemon_kit/capistrano/templates/config/deploy/logrotate.erb

@@ -0,0 +1,13 @@
+<%= shared_path %>/log/*.log {
+  daily
+  missingok
+  compress
+  rotate 7
+  sharedscripts
+
+  postrotate
+    for i in <%= shared_path %>/pids/*.pid; do
+      kill -HUP `cat $i`
+    done
+  endscript
+}

data/lib/generators/daemon_kit/capistrano/templates/config/deploy.rb.tt

@@ -41,6 +41,9 @@ end
 # Hook into capistrano's events
 before "deploy:update_code", "deploy:check"
 
+# Setup log rotation support with every deploy (safe)
+#after 'deploy:symlink', 'deploy:logrotate'
+
 # Create some tasks related to deployment
 namespace :deploy do
 
@@ -50,4 +53,15 @@ namespace :deploy do
       puts "Current revision: " + out.chomp
     end
   end
+
+  desc "Install log rotation script on server"
+  task :logrotate do
+    require 'erb'
+    upload_path = "#{shared_path}/system/logrotate"
+    template = File.read("config/deploy/logrotate.erb")
+    file = ERB.new(template).result(binding)
+    put file, upload_path, :mode => 0644
+    run "if [ -e /etc/logrotate.d ]; then sudo cp #{shared_path}/system/logrotate /etc/logrotate.d/#{name}; fi"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: daemon-kit
 version: !ruby/object:Gem::Version 
-  version: 0.1.8pre
+  version: 0.1.8rc1
 platform: ruby
 authors: 
 - kenneth.kalmer@gmail.com
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 +02:00
+date: 2010-04-13 00:00:00 +02:00
 default_executable: daemon-kit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,6 +171,7 @@ files:
 - lib/generators/daemon_kit/capistrano/templates/Capfile
 - lib/generators/daemon_kit/capistrano/templates/USAGE
 - lib/generators/daemon_kit/capistrano/templates/config/deploy.rb.tt
+- lib/generators/daemon_kit/capistrano/templates/config/deploy/logrotate.erb
 - lib/generators/daemon_kit/capistrano/templates/config/deploy/production.rb.tt
 - lib/generators/daemon_kit/capistrano/templates/config/deploy/staging.rb.tt
 - lib/generators/daemon_kit/capistrano/templates/config/environments/staging.rb