pleaserun 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79e4406ef60541b06355384567e5996f601ba3f1
-  data.tar.gz: 2a7229543b510dc11eebddaa57c9bb4086d4ee26
+  metadata.gz: 7e50e060860038237de312754205fa8496da9f9e
+  data.tar.gz: 08df6e23c1667e27ccd137bfb4736130b9a02ffb
 SHA512:
-  metadata.gz: 2e108a2241aae8a69ad9f39ac3cc5ebfcc583f3682f5af46a813c290e8841ac16a23442c46d0580fd056342b7b03023aef11a4966d1f74eb28fe781d748174b3
-  data.tar.gz: b95b589a5d70a618aceb1f1318e3a02c4957a7818311fd8b6a64673ba078959bf39200f9f80d691b276bf9486063f2d75c1b232f1cb5a6321e344068b8732fd2
+  metadata.gz: b10ac793a4e4d2811942ffffe229f058cd2055cfd92adae69b336662d6fbd856e31e98b9c4289a3215fb91ff979a5c42d72ccfdfc4bda951ca0583d97e7007d6
+  data.tar.gz: 971a24a661d868ec6d750a13fc6c70bcc08ec74f07e39112245547ea220f270230974e25f325996c734c262fe5528f51faa0b8e8887aff86945bc54ba36ed4eb

data/lib/pleaserun/platform/base.rb

@@ -130,6 +130,10 @@ class PleaseRun::Platform::Base
     validate { |v| v == "ulimited" || v.to_i > 0 }
   end
 
+  # TODO(sissel): Move this into the sysv platform
+  attribute :sysv_log_path, "The destination for log output. If ending with a trailing / is treated like a directory with path/<name>.log. This setting only currently works with the sysv platform. This flag may go away at any time because I'm not sure we can easily abstract the logging feature across different service managers. Upstart and systemd don't even have this concept.",
+    :default => "/var/log/"
+
 
   attribute :prestart, "A command to execute before starting and restarting. A failure of this command will cause the start/restart to abort. This is useful for health checks, config tests, or similar operations."
 
@@ -186,4 +190,12 @@ class PleaseRun::Platform::Base
   def install_actions
     return []
   end # def install_actions
+
+  def sysv_log
+    if sysv_log_path.end_with?("/")
+      File.join(sysv_log_path, name)
+    else
+      sysv_log_path
+    end
+  end
 end # class PleaseRun::Base

data/pleaserun.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |spec|
   files = `git ls-files`.split("\n")
 
   spec.name = "pleaserun"
-  spec.version = "0.0.10"
+  spec.version = "0.0.11"
   spec.summary = "pleaserun"
   spec.description = "pleaserun"
   spec.license = "Apache 2.0"

data/spec/pleaserun/platform/base_spec.rb

@@ -24,5 +24,31 @@ describe PleaseRun::Platform::Base do
     it "#group should be root" do
       insist { subject.group } == "root"
     end
+
+    context "#sysv_log" do
+      let(:name) { "fancy" }
+      before { subject.name = name }
+
+      context "default" do
+        it "should be in /var/log" do
+          expect(subject.sysv_log).to(be == "/var/log/#{name}")
+        end
+      end
+
+      context "when given a directory" do
+        let(:path) { "/tmp/" }
+        before { subject.sysv_log_path = path }
+        it "should be <path>/<name>" do
+          expect(subject.sysv_log).to(be == File.join(path, subject.name))
+        end
+      end
+      context "when given a path" do
+        let(:path) { "/some/path" }
+        before { subject.sysv_log_path = path }
+        it "should be exactly the path given" do
+          expect(subject.sysv_log).to(be == path)
+        end
+      end
+    end
   end
 end

data/templates/sysv/lsb-3.1/init.sh

@@ -57,7 +57,7 @@ start() {
     {{{ulimit_shell}}}
     cd \"$chdir\"
     exec \"$program\" $args
-  " > /var/log/$name.log 2> /var/log/$name.err &
+  " > {{{ sysv_log }}}.log 2> {{{ sysv_log }}}.err &
 
   # Generate the pidfile from here. If we instead made the forked process
   # generate it there will be a race condition between the pidfile writing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pleaserun
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin