zeusd 0.2.0 → 0.2.1

data/README.md

@@ -1,4 +1,4 @@
-# Zeusd [![Gem Version](https://badge.fury.io/rb/zeusd.png)](http://badge.fury.io/rb/zeusd) [![Build Status](https://travis-ci.org/veloper/zeusd.png?branch=master)](https://travis-ci.org/veloper/zeusd) [![Code Climate](https://codeclimate.com/github/veloper/zeusd.png)](https://codeclimate.com/github/veloper/zeusd)
+# Zeusd [![Gem Version](https://badge.fury.io/rb/zeusd.png)](http://badge.fury.io/rb/zeusd) [![Dependency Status](https://gemnasium.com/veloper/zeusd.png)](https://gemnasium.com/veloper/zeusd) [![Build Status](https://travis-ci.org/veloper/zeusd.png?branch=master)](https://travis-ci.org/veloper/zeusd) [![Code Climate](https://codeclimate.com/github/veloper/zeusd.png)](https://codeclimate.com/github/veloper/zeusd)
 
 Zeusd aims to provide greater control and easier scripting of the [Zeus Gem](https://github.com/burke/zeus) via daemonization.
 
@@ -53,4 +53,4 @@ $ gem install zeusd
 
 ## License
 
-* Zeusd is released under the New BSD license. http://dan.doezema.com/licenses/new-bsd/
+* Zeusd is released under the New BSD license. http://dan.doezema.com/licenses/new-bsd/

data/lib/zeusd/daemon.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'thread'
 require 'childprocess'
 require 'pathname'
@@ -7,15 +8,12 @@ module Zeusd
   class DaemonException < StandardError; end
 
   class Daemon
-    attr_reader :cwd, :verbose, :log_file, :log_queue, :interpreter, :child_process
-
-
     include Hooks
-    define_hooks :after_start!, :after_stop!, :after_output
 
-    after_start!  { log(:start) }
-    after_stop!   { log(:stop) }
-    after_output  {|x| log(x, :zeus) }
+    define_hooks :after_start!, :after_stop!, :before_stop!, :after_output
+
+    after_start! { logger.info("Zeusd") { "Start - pid(#{process.pid})" } }
+    before_stop! { logger.info("Zeusd") { "Stop  - pid(#{process ? process.pid : 'nil'})" } }
 
     after_stop! do
       (socket_file.delete rescue nil) if socket_file.exist?
@@ -23,9 +21,12 @@ module Zeusd
 
     after_output do |output|
       interpreter.translate(output)
-      puts(output) if verbose?
+      logger.info("Zeus"){output}
+      puts(output) if verbose
     end
 
+    attr_reader :cwd, :verbose, :log_file, :interpreter, :child_process
+
     def initialize(options = {})
       @cwd         = Pathname.new(options[:cwd] || Dir.pwd).realpath
       @verbose     = !!options[:verbose]
@@ -51,6 +52,8 @@ module Zeusd
     end
 
     def stop!
+      run_hook :before_stop!
+
       return self unless process
 
       # Kill process tree and wait for exits
@@ -84,24 +87,16 @@ module Zeusd
       cwd.join('.zeus.sock')
     end
 
-    def verbose?
-      !!verbose
-    end
-
     protected
 
-    def log(entry, type = :zeusd)
-      log_queue << "<#{type.to_s} utc='#{Time.now.utc}'>#{entry}</#{type.to_s}>\n"
-    end
-
-    def log_queue
-      @log_queue ||= Queue.new
-    end
-
-    def ensure_log_worker
-      @log_worker ||= Thread.new do
-        while value = log_queue.shift
-          log_file.open("a+") {|f| f.write(value) }
+    def logger
+      @logger ||= Logger.new(log_file.to_path).tap do |x|
+        x.formatter = proc do |severity, datetime, progname, msg|
+          color  = progname["Zeusd"] ? 36 : 35
+          ts     = datetime.strftime('%Y-%m-%d %H:%M:%S')
+          prefix = "[#{ts}][#{progname.ljust(6)}]"
+          msg    = msg.chomp.gsub("\n", "\n".ljust(prefix.length) + "\e[#{color}m|\e[0m ")
+          "\e[#{color}m#{prefix}\e[0m" + " #{msg}\n"
         end
       end
     end
@@ -117,8 +112,6 @@ module Zeusd
 
       @writer.close
 
-      ensure_log_worker
-
       Thread.new do
         while (buffer = (@reader.readpartial(10000) rescue nil)) do
           run_hook :after_output, buffer

data/lib/zeusd/version.rb

@@ -1,3 +1,3 @@
 module Zeusd
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeusd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3492660387363496392
+      hash: -796152463092065801
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3492660387363496392
+      hash: -796152463092065801
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25