daemon-overlord 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17aa7dde11842194e86584ae13ede9a1460f20d7
-  data.tar.gz: 14c22770833b6d44be76dadf88564f08fa7f0dcb
+  metadata.gz: 521ddd1331345101eedb6032742cbe4b4e7d1768
+  data.tar.gz: 2699ee4f39ceb970f0193f9cb9c12ff9263d050c
 SHA512:
-  metadata.gz: dbff09891ffedfa23795988974215e099527cbe5dbfb538cb26a4bdd72df4747fe0cf4ae8c0391ba737f6ecd443d3056aa69c3382167368f43bd4b60792e6ade
-  data.tar.gz: 28d1a69c2be2d0700bfbb2b2b58e19696b1be7598d9fd12e5d1b13762d53385f3a04e43927548cc492f8d6c6c113141f443d7fb81cea6785dd49c0e7f67fae47
+  metadata.gz: 2dc467f19f9151915fa620c1b15be74883efea61eee8645b836ac511e8025616fcf5334936d3d7b851aec980d9523b5eaaae40a6dc448f1aa4748384ac31707b
+  data.tar.gz: 0676fc557c4c39ed201cd00ca71e1ab70e6563c95ca38de8464c7dec7f6ac5f1eadc42139e11d4bfd5059d2959f2313b4dd4c1b9e8c5377c482e701b2f2c5d0c

data/exe/overlord

@@ -6,12 +6,18 @@ require 'process_runner'
 
 module Overlord
 
-  DEFAULT_CONFIG_FILE_PATH = File.expand_path('../../config/overlord.yml', __FILE__)
-  DEFAULT_PIDS_FILE_PATH = File.expand_path('../../tmp/pids', __FILE__)
+  DEFAULT_CONFIG_FILE_PATH = File.join(Dir.pwd, 'config/overlord.yml')
+  DEFAULT_PIDS_FILE_PATH = File.join(Dir.pwd, 'tmp/pids')
+  DEFAULT_LOGS_FILE_PATH = File.join(Dir.pwd, 'log')
 
   def self.with_config_and_pids_files(options)
     config_path = File.absolute_path options[:config]
     pids_path = File.absolute_path options[:pids]
+
+    if !File.directory?(File.dirname(pids_path))
+      Dir.mkdir File.dirname(pids_path)
+    end
+
     File.open(config_path, 'r') do |config_file|
       config = YAML.load(config_file) || {}
       if !File.exists?(pids_path)
@@ -40,7 +46,7 @@ module Overlord
   def self.force_kill_process(pid) Process.kill('KILL', pid) end
 
   module Actions
-    def start_daemon(app, config, pids, pids_file_path)
+    def start_daemon(app, config, pids, pids_file_path, log_directory = nil, merge_out_and_err = nil)
       if pids[app]
         if Overlord.process_exists?(pids[app])
           say "WARNING: #{app} is already started (PID: #{pids[app]})."
@@ -52,10 +58,25 @@ module Overlord
       end
       command = config[app]
 
+      options = {}
+      if log_directory
+        if !File.directory?(log_directory)
+          say_status :mkdir, "Creating log directory, \"#{log_directory}\"."
+          Dir.mkdir log_directory
+        end
+        if merge_out_and_err
+          options[:err] = :out
+          options[:out] = [File.join(log_directory, "#{app}.log"), 'a']
+        else
+          options[:err] = [File.join(log_directory, "#{app}.log.e"), 'a']
+          options[:out] = [File.join(log_directory, "#{app}.log.o"), 'a']
+        end
+      end
+
       desc = "`#{command}` from #{Dir.pwd}"
 
       say_status :run_as_daemon, desc
-      pid = Process.detach(Process.spawn(command)).pid
+      pid = Process.detach(Process.spawn(command, options)).pid
       pids[app] = pid
       say_status :start, "#{app} started with PID #{pid}."
     end
@@ -95,6 +116,12 @@ module Overlord
     def self.with_pids
       method_option :pids, :aliases => ['-p'], :default => DEFAULT_PIDS_FILE_PATH, :desc => "Path to SSV file where application PIDs will be saved."
     end
+    def self.with_logs
+      method_option :logs, :aliases => ['-l'], :default => DEFAULT_LOGS_FILE_PATH, :desc => "Path to a directory where application standard out and error will be logged."
+    end
+    def self.with_merge_stdout_and_stderr
+      method_option :merge, :type => :boolean, :aliases => ['-m'], :default => true, :desc => "Log application standard out and error together."
+    end
 
     desc "status", "Show the status of managed applications."
     with_config
@@ -120,14 +147,16 @@ module Overlord
     desc "start", "Start an application."
     with_config
     with_pids
+    with_logs
+    with_merge_stdout_and_stderr
     method_option :app, :aliases => ['-a'], :desc => "Application to start. Starts all if none specified."
     def start
       Overlord.with_config_and_pids_files(options) do |config_file, config, pids_file, pids|
         if options[:app]
-          start_daemon(options[:app], config, pids, pids_file.path)
+          start_daemon(options[:app], config, pids, pids_file.path, options[:logs], options[:merge])
         else
           config.keys.each do |app|
-            start_daemon(app, config, pids, pids_file.path)
+            start_daemon(app, config, pids, pids_file.path, options[:logs], options[:merge])
           end
         end
         pids_file.write(YAML.dump(pids)) unless pids.empty?
@@ -154,6 +183,8 @@ module Overlord
     desc "restart", "Restart an application."
     with_config
     with_pids
+    with_logs
+    with_merge_stdout_and_stderr
     method_option :app, :aliases => ['-a'], :desc => "Application to restart. Restarts all if none specified."
     def restart
       stop

data/lib/overlord/version.rb

@@ -1,3 +1,3 @@
 module Overlord
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemon-overlord
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dustin Morrill
@@ -125,3 +125,4 @@ signing_key:
 specification_version: 4
 summary: Start and stop daemons with minimal monitoring.
 test_files: []
+has_rdoc: