procodile 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ebcd819297e20dd833878b4eb0f260174cf24eb
-  data.tar.gz: aa26143241c51ecb562e0d6216741b49df4e82af
+  metadata.gz: cc9014711e488092ae55249f9fcda8dbb2fb9cc1
+  data.tar.gz: 9181ab265781b1b39a20524705eab6b6c31117e9
 SHA512:
-  metadata.gz: e573069a30bfedc7d7547afb23e30b96353133cd64e5b72e50fe13a0bdc839e5b7d69ea72c3997a0b62cde12717d85b6eead0fb7baec388e146a54c4c95685ee
-  data.tar.gz: eb34037464dcc04ed0ebda4f259c3c3ad09debcb9e2ade88e78a8ee5c3b16b67ddcc9189f1d40aa78558d13894723cb2518cc8006fd6bb38264ad94ca36b237f
+  metadata.gz: 4b12e1eb9fb33548ea5b01d757a73cf377a024cc6e5a0877168fe1240e359c29f569a9b7fcc888c1d8d20008dcdad54497292b79471db1d5efc44b848b2f48a6
+  data.tar.gz: 135e12b6084a9cddad8736913bec02ab0dd591728f212340e60e7f83302887dc80551adc09b19cf220306ebde3e742f8b6fc6669cc7794228f84d1f0a39546c7

data/lib/procodile/config.rb

@@ -99,7 +99,22 @@ module Procodile
     end
 
     def log_path
-      @log_path ||= File.expand_path(fetch(local_options['log_path']) || fetch(options['log_path']) || 'procodile.log', @root)
+      log_path = fetch(local_options['log_path']) || fetch(options['log_path'])
+      if log_path
+        File.expand_path(log_path, @root)
+      elsif log_path.nil? && self.log_root
+        File.join(self.log_root, 'procodile.log')
+      else
+        File.expand_path("procodile.log", @root)
+      end
+    end
+
+    def log_root
+      if log_root = (fetch(local_options['log_root']) || fetch(options['log_root']))
+        File.expand_path(log_root, @root)
+      else
+        nil
+      end
     end
 
     def sock_path
@@ -128,9 +143,13 @@ module Procodile
 
     def fetch(value, default = nil)
       if value.is_a?(Hash)
-        value[@environment] || default
+        if value.has_key?(@environment)
+          value[@environment]
+        else
+          default
+        end
       else
-        value || default
+        value.nil? ? default : value
       end
     end
 

data/lib/procodile/instance.rb

@@ -121,6 +121,9 @@ module Procodile
         @supervisor.add_instance(self, io)
         ::Process.detach(@pid)
         Procodile.log(@process.log_color, description, "Started with PID #{@pid}" + (@tag ? " (tagged with #{@tag})" : ''))
+        if self.process.log_path
+          Procodile.log(@process.log_color, description, "Logging to #{self.process.log_path}")
+        end
         @started_at = Time.now
       end
     end

data/lib/procodile/process.rb

@@ -70,7 +70,26 @@ module Procodile
     # none, output will be written to the supervisor log.
     #
     def log_path
-      @options['log_path'] ? File.expand_path(@options['log_path'], @config.root) : nil
+      @options['log_path'] ? File.expand_path(@options['log_path'], @config.root) : default_log_path
+    end
+
+    #
+    # Return the defualt log file name
+    #
+    def default_log_file_name
+      @options['log_file_name'] || "#{@name}.log"
+    end
+
+    #
+    # Return the log path for this process if no log path is provided and split logs
+    # is enabled
+    #
+    def default_log_path
+      if @config.log_root
+        File.join(@config.log_root, default_log_file_name)
+      else
+        nil
+      end
     end
 
     #

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -75,4 +75,3 @@ specification_version: 4
 summary: This gem will help you run Ruby processes from a Procfile on Linux servers
   in the background.
 test_files: []
-has_rdoc: