zeusd 0.2.4 → 0.2.5

data/lib/zeusd/daemon.rb

@@ -1,37 +1,13 @@
-require 'logger'
 require 'thread'
 require 'childprocess'
 require 'pathname'
-require 'hooks'
 require 'file-tail'
-require 'json'
 
-module Zeusd
-  class DaemonException < StandardError; end
+require 'zeusd/daemon_logging'
 
+module Zeusd
   class Daemon
-    include Hooks
-
-    define_hooks :before_action, :after_action, :after_output
-
-    before_action do |action|
-      details = {}
-      details[:process] = process.attributes if process
-      log_event("Before: #{action}", details)
-    end
-
-    after_action do |action|
-      details = {}
-      details[:process] = process.attributes if process
-      log_event("After: #{action}", details)
-    end
-
-    after_output do |output|
-      interpreter.translate(output)
-      puts output if verbose
-    end
-
-    attr_reader :cwd, :verbose, :log_file, :interpreter, :child_process
+    attr_reader :cwd, :verbose, :interpreter, :child_process
 
     def initialize(options = {})
       @cwd         = Pathname.new(options[:cwd] || Dir.pwd).realpath
@@ -40,8 +16,6 @@ module Zeusd
     end
 
     def start!(options = {})
-      run_hook :before_action, __method__
-
       start_child_process!
 
       @process = Zeusd::Process.find(child_process.pid)
@@ -50,44 +24,31 @@ module Zeusd
         sleep(0.1) until loaded?
       end
 
-      run_hook :after_action, __method__
-
       self
     end
 
     def restart!(options = {})
-      run_hook :before_action, __method__
-
       stop!.start!(options)
-
-      run_hook :after_action, __method__
-
-      self
     end
 
     def stop!
-      run_hook :before_action, __method__
-
       return self unless process
 
       # Kill process tree and wait for exits
-      process.kill!(:recursive => true, :wait => true)
+      process.kill!(:recursive => true, :signal => "KILL", :wait => true)
 
       # Clean up socket file if stil exists
       (zeus_socket_file.delete rescue nil) if zeus_socket_file.exist?
 
-      # Check for remaining processes
-      if[process, process.descendants].flatten.select(&:alive?).any?
-        raise DaemonException, "Unable to KILL processes: " + alive_processes.join(', ')
-      end
-
       @process = nil
 
-      run_hook :after_action, __method__
-
       self
     end
 
+    def processes
+      process ? [process, process.descendants].flatten : []
+    end
+
     def process
       @process ||= Process.all.find {|p| !!p.command[/zeus.*start$/] && p.cwd == cwd }
     end
@@ -106,27 +67,22 @@ module Zeusd
       end
     end
 
-    protected
-
-    def log_event(type, details = nil)
-      logger.info do
-        "\e[35m[Event] (#{type})\e[0m" + (!details.empty? ? " " + JSON.pretty_generate(details) : "")
-      end
+    def to_json(*args)
+      {
+        :class   => self.class.name,
+        :cwd     => cwd.to_path,
+        :verbose => verbose,
+        :process => process
+      }.to_json(*args)
     end
 
-    def logger
-      @logger ||= Logger.new(cwd.join('log', 'zeusd.log').to_path).tap do |x|
-        x.formatter = proc do |severity, datetime, progname, msg|
-          prefix    = "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}]"
-          "\e[36m#{prefix}\e[0m" + " #{msg}\n"
-        end
-      end
-    end
+    protected
 
     def start_child_process!
-      # Truncate and cast to File
+      # Truncate and cast to File instance
       zeus_log_file.open("w") {}
-      std_file = File.new(zeus_log_file, 'w+').tap{|x| x.sync = true}
+      std_file = File.new(zeus_log_file, 'w+')
+      std_file.sync = true
 
       # Prep and Start child process
       @child_process = ChildProcess.build("zeus", "start")
@@ -143,7 +99,10 @@ module Zeusd
           log.extend(File::Tail)
           log.interval = 0.1
           log.backward(100)
-          log.tail {|line| run_hook(:after_output, line) }
+          log.tail do |line|
+            interpreter.translate(line)
+            puts line if verbose
+          end
         end
       end
 
@@ -153,5 +112,6 @@ module Zeusd
       @child_process
     end
 
+    include Zeusd::DaemonLogging
   end
 end

data/lib/zeusd/daemon_logging.rb

@@ -0,0 +1,44 @@
+require 'logger'
+require 'json'
+
+module Zeusd
+  module DaemonLogging
+
+    def log_file
+      cwd.join('log', 'zeusd.log')
+    end
+
+    def track(occurred, method, details = nil)
+      logger.info do
+        "\e[35m[Track] [#{occurred.to_s.upcase}] .#{method}()\e[0m" + (details ? " " + JSON.pretty_generate(details) : "")
+      end
+    end
+
+    def logger
+      @logger ||= Logger.new(log_file.to_path).tap do |l|
+        l.formatter = proc do |severity, datetime, progname, msg|
+          "\e[36m[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}]\e[0m" + " #{msg}\n"
+        end
+      end
+    end
+
+    def self.included(base)
+      tracked_methods = [:start!, :stop!, :restart!, :start_child_process!]
+      base.instance_eval do
+        tracked_methods.each do |method_name|
+          original_method = instance_method(method_name)
+          track           = instance_method(:track)
+
+          define_method(method_name) do |*args, &block|
+            track.bind(self).call(:before, method_name, :args => args)
+            original_method.bind(self).call(*args, &block).tap do |x|
+              track.bind(self).call(:after, method_name, :return => x)
+            end
+          end
+        end
+      end
+    end
+
+
+  end
+end

data/lib/zeusd/interpreter.rb

@@ -83,6 +83,10 @@ module Zeusd
         end
       end
 
+      def color?
+        !!color
+      end
+
     end
 
   end

data/lib/zeusd/process.rb

@@ -18,6 +18,10 @@ module Zeusd
       end
     end
 
+    def to_json(*args)
+      attributes.to_json(*args)
+    end
+
     def self.ps(options = {})
       keywords = Array(options[:keywords]) | %w[pid ppid pgid stat command]
       command  = ["ps"].tap do |ps|

data/lib/zeusd/version.rb

@@ -1,3 +1,3 @@
 module Zeusd
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeusd
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -158,6 +158,7 @@ files:
 - bin/zeusd
 - lib/zeusd.rb
 - lib/zeusd/daemon.rb
+- lib/zeusd/daemon_logging.rb
 - lib/zeusd/interpreter.rb
 - lib/zeusd/process.rb
 - lib/zeusd/version.rb
@@ -231,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4127736754607950828
+      hash: -1735692127611811224
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4127736754607950828
+      hash: -1735692127611811224
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25