dante 0.1.2 → 0.1.3

data/README.md

@@ -66,10 +66,11 @@ This gives your binary several useful things for free:
 will start the app undaemonized in the terminal, handling trapping and stopping the process.
 
 ```
-./bin/myapp -p 8080 -d -P /var/run/myapp.pid
+./bin/myapp -p 8080 -d -P /var/run/myapp.pid -l /var/log/myapp.log
 ```
 
 will daemonize and start the process, storing the pid in the specified pid file.
+All stdout and stderr will be redirected to the specified logfile.
 
 ```
 ./bin/myapp -k -P /var/run/myapp.pid
@@ -128,7 +129,7 @@ You can also use dante programmatically to start, stop and restart arbitrary cod
 
 ```ruby
 # daemon start
-Dante::Runner.new('gitdocs').execute(:daemonize => true, :pid_path => @pid) { something! }
+Dante::Runner.new('gitdocs').execute(:daemonize => true, :pid\_path => @pid, :log\_path => @log\_path) { something! }
 # daemon stop
 Dante::Runner.new('gitdocs').execute(:kill => true, :pid_path => @pid)
 # daemon restart

data/lib/dante/runner.rb

@@ -31,6 +31,7 @@ module Dante
       @options = {
         :host => '0.0.0.0',
         :pid_path => "/var/run/#{@name}.pid",
+        :log_path => false,
         :debug => true
       }.merge(defaults)
     end
@@ -69,9 +70,7 @@ module Dante
         exit if fork
         store_pid(Process.pid)
         File.umask 0000
-        STDIN.reopen "/dev/null"
-        STDOUT.reopen "/dev/null", "a"
-        STDERR.reopen STDOUT
+        redirect_output!
         start
       end
       # Ensure process is running
@@ -158,6 +157,10 @@ module Dante
           options[:daemonize] = v
         end
 
+        opts.on("-l", "--log FILE", String, "Logfile for output") do |v|
+          options[:log_path] = v
+        end
+
         opts.on("-k", "--kill [PORT]", String, "Kill specified running daemons - leave blank to kill all.") do |v|
           options[:kill] = v
         end
@@ -199,6 +202,23 @@ module Dante
       end
     end
 
+    # Redirect output based on log settings (reopens stdout/stderr to specified logfile)
+    # If log_path is nil, redirect to /dev/null to quiet output
+    def redirect_output!
+      if log_path = options[:log_path]
+        FileUtils.touch log_path
+        File.open(log_path, 'a') do |f|
+          $stdout.reopen(f)
+          $stderr.reopen(f)
+        end
+      else # redirect to /dev/null
+        STDIN.reopen "/dev/null"
+        STDOUT.reopen "/dev/null", "a"
+        STDERR.reopen STDOUT
+      end
+      log_path = options[:log_path] ? options[:log_path] : "/dev/null"
+    end
+
     # Runs until the block condition is met or the timeout_seconds is exceeded
     # until_true(10) { ...return_condition... }
     def until_true(timeout_seconds, interval=1, &block)

data/lib/dante/version.rb

@@ -1,3 +1,3 @@
 module Dante
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/runner_test.rb

@@ -21,7 +21,7 @@ describe "dante runner" do
   describe "with daemonize flag" do
     before do
       @process = TestingProcess.new('b')
-      @run_options = { :daemonize => true, :pid_path => "/tmp/dante.pid", :port => 8080 }
+      @run_options = { :daemonize => true, :pid_path => "/tmp/dante.pid", :port => 8080, :log_path => false }
       @runner = Dante::Runner.new('test-process-2', @run_options) { |opts|
         @process.run_b!(opts[:port]) }
       @stdout = capture_stdout { @runner.execute }
@@ -49,10 +49,33 @@ describe "dante runner" do
     end
   end # daemonize
 
+  describe "with daemonize flag and log file specified" do
+    before do
+      @logfile = '/tmp/dante-logging.log'
+      FileUtils.rm(@logfile) if File.exist?(@logfile)
+      @process = TestingProcess.new('c')
+      @run_options = { :daemonize => true, :pid_path => "/tmp/dante.pid", :port => 8081, :log_path => @logfile, :debug => false }
+      @runner = Dante::Runner.new('test-process-2', @run_options) { |opts|
+        @process.run_c!(opts[:port]) }
+      @runner.execute
+      sleep(1)
+    end
+
+    it "can properly handles log to file and aborts on INT" do
+      refute_equal 0, @pid = `cat /tmp/dante.pid`.to_i
+      Process.kill "INT", @pid
+      sleep(1) # Wait to complete
+      @output = File.read(@logfile)
+      assert_match /Started on 8081!!/, @output
+      assert_match /Interrupt!!/, @output
+      assert_match /Closing!!/, @output
+    end
+  end
+
   describe "with execute accepting block" do
     before do
       @process = TestingProcess.new('b')
-      @run_options = { :daemonize => true, :pid_path => "/tmp/dante.pid", :port => 8080 }
+      @run_options = { :daemonize => true, :pid_path => "/tmp/dante.pid", :port => 8080, :log_path => false }
       @runner = Dante::Runner.new('test-process-2', @run_options)
       @stdout = capture_stdout { @runner.execute { |opts| @process.run_b!(opts[:port]) } }
       sleep(1)

data/test/test_helper.rb

@@ -53,4 +53,15 @@ class TestingProcess
       @tmp.close
     end
   end # run_b!
+
+  # For logging test
+  def run_c!(port=9091)
+    puts "Started on #{port}!!"
+    sleep(100)
+  rescue Interrupt
+    puts "Interrupt!!"
+    exit
+  ensure
+    puts "Closing!!"
+  end
 end # TestingProcess

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dante
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 -08:00
-default_executable: 
+date: 2012-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -26,9 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -40,9 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -54,9 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -82,7 +67,6 @@ files:
 - test/dante_test.rb
 - test/runner_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/bazaarlabs/dante
 licenses: []
 
@@ -96,23 +80,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dante
-rubygems_version: 1.6.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Turn any process into a demon