zeusd 0.2.1 → 0.2.3

data/lib/zeusd/daemon.rb

@@ -3,6 +3,8 @@ require 'thread'
 require 'childprocess'
 require 'pathname'
 require 'hooks'
+require 'file-tail'
+require 'json'
 
 module Zeusd
   class DaemonException < StandardError; end
@@ -12,16 +14,16 @@ module Zeusd
 
     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_start! { log_event :start, :process => process ? process.attributes : nil }
+    before_stop! { log_event :stop, :process => process ? process.attributes : nil }
 
     after_stop! do
-      (socket_file.delete rescue nil) if socket_file.exist?
+      (zeus_socket_file.delete rescue nil) if zeus_socket_file.exist?
     end
 
     after_output do |output|
       interpreter.translate(output)
-      logger.info("Zeus"){output}
+      # logger.info("Zeus"){output}
       puts(output) if verbose
     end
 
@@ -42,9 +44,9 @@ module Zeusd
         sleep(0.1) until loaded?
       end
 
-      self
-    ensure
       run_hook :after_start!
+
+      self
     end
 
     def restart!(options = {})
@@ -66,9 +68,9 @@ module Zeusd
 
       @process = nil
 
-      self
-    ensure
       run_hook :after_stop!
+
+      self
     end
 
     def process
@@ -79,45 +81,63 @@ module Zeusd
       interpreter.complete?
     end
 
-    def log_file
-      cwd.join('log/zeusd.log')
+    def log_event(type, details = nil)
+      logger.info("EVENT") do
+        ">>> #{type.to_s.upcase}" + (details ? (" >>> " + JSON.pretty_generate(details)) : "")
+      end
+    end
+
+    def logger
+      @logger ||= Logger.new(log_file.to_path).tap do |x|
+        x.formatter = proc do |severity, datetime, type, msg|
+          prefix    = "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}][#{type}]"
+          msg       = msg.chomp.gsub("\n", "\n".ljust(prefix.length) + "\e[36m|\e[0m ")
+          "\e[36m#{prefix}\e[0m" + " #{msg}\n"
+        end
+      end
     end
 
-    def socket_file
+    def zeus_socket_file
       cwd.join('.zeus.sock')
     end
 
-    protected
+    def log_file
+      cwd.join('log/zeusd.log')
+    end
 
-    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
+    def zeus_log_file
+      cwd.join('.zeus.log').tap do |path|
+        FileUtils.touch(path.to_path)
       end
     end
 
+    protected
+
     def start_child_process!
-      @reader, @writer = IO.pipe
+      # Truncate and cast to File
+      zeus_log_file.open("w") {}
+      std_file = File.new(zeus_log_file, 'w+').tap{|x| x.sync = true}
+
+      # Prep and Start child process
       @child_process = ChildProcess.build("zeus", "start")
       @child_process.environment["BUNDLE_GEMFILE"] = cwd.join("Gemfile").to_path
-      @child_process.io.stdout = @child_process.io.stderr = @writer
-      @child_process.cwd = cwd.to_path
-      @child_process.detach = true
+      @child_process.io.stderr = std_file
+      @child_process.io.stdout = std_file
+      @child_process.cwd       = cwd.to_path
+      @child_process.detach    = true
       @child_process.start
 
-      @writer.close
-
+      # Start tailing child process output
       Thread.new do
-        while (buffer = (@reader.readpartial(10000) rescue nil)) do
-          run_hook :after_output, buffer
+        File.open(std_file.to_path) do |log|
+          log.extend(File::Tail)
+          log.interval = 0.1
+          log.backward(100)
+          log.tail {|line| run_hook(:after_output, line) }
         end
       end
 
+      # Block until the first zeus command has been registered
       sleep 0.1 until interpreter.commands.any?
 
       @child_process

data/lib/zeusd/interpreter.rb

@@ -44,8 +44,6 @@ module Zeusd
       false
     end
 
-
-
     def last_update
       @lines[@lines.rindex(&:update?)..-1].join("\n").to_s
     end
@@ -85,10 +83,6 @@ module Zeusd
         end
       end
 
-      def color?
-        !!color
-      end
-
     end
 
   end

data/lib/zeusd/version.rb

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

data/zeusd.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"         , "~> 0.18.1"
-  spec.add_runtime_dependency "childprocess" , "~> 0.4.0"
+  spec.add_runtime_dependency "childprocess" , ">= 0.5.1"
+  spec.add_runtime_dependency "file-tail"    , "~> 1.0.12"
   spec.add_runtime_dependency "hooks"        , "~> 0.3.3"
   spec.add_runtime_dependency "zeus"         , "~> 0.13.3"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeusd
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -29,12 +29,28 @@ dependencies:
         version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: file-tail
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.12
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -796152463092065801
+      hash: 4001944416869534268
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -796152463092065801
+      hash: 4001944416869534268
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25