ost-bin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzg5YjIyZTAxMTliOTFjYTE4NWI2MGUwNTMxNWU4MjY2ZjExMDU0YQ==
+    YTBlZDRlZDNjZGEwMjY0Zjk4N2VlMDI2ZjgxNjMyY2RjYmE4YzhmMg==
   data.tar.gz: !binary |-
-    MzI1ZWRhNmE2NDJlOWZkMTZiZjBlZWUwOGU4MjBjMDNiYzY0YmM4NA==
+    NzFkNmJhYWVhNWZmNzliMWZmNTRjZWU5NmQ0MTk5ZDliZDZlMzYwOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWJhNGNhYzZlNzBhMWI2OTk2OGYwN2U4Y2IzODA4ODM5ZGJhZjcwMWZmNTJh
-    M2E2ZTI2YmZmMjhhN2IxNjA0NzFkMDQ0MmMyNjRkNGY4ZjliODBlMzA2ZDRi
-    OTc5NWM0OWI0M2Q4NDNkOTkyOTliZjYxYzA1ZTBlZWE3NTUyYzg=
+    MTliMGY4YjJkZmZmYmJjZGUzYjY0ODRmY2Q4MGUwYTEyYmIzMjQ3YWYzNTYw
+    YzgwMzgyNDZjNzMyOTlkN2VkNzAyNTNiN2FiOWJlODQ5ZGI2M2VjYmEwMzRi
+    ZDQxNTU2OWZiYmU0OGU2YzFhMzYxYjM0OTBlNWJjNDllNWZlYmI=
   data.tar.gz: !binary |-
-    MzQ3MDUxYWQ1YTIzN2QwNjA5NGNlMzMyZTk5NDEzNzc5YTFlZjlhYTE4ZGJk
-    YmJlMWMyYTM4NjkzMmViM2NlNTkzNGQwYTk0M2M2MWFlMWVjNWJiZWY2MTYy
-    OWY0NmQ4OGVlNGExMTMwY2ViMjhjMDI4ZDM3YjY1ZDk3NzhmOWY=
+    NTEwNTEyNTZmZWFkYWU4OGRlMWMzYTYwZmY2MTgzNDBiOGY3MzM5MjJhYzNm
+    NGQ4MjFhYzgzN2IyYmIwNjE1YTI3OWM3MDQ1YzdlNDdkMTRlNGMzNDhjYmNh
+    ZWU1YzRiYzEzNDg2ZTkxNWRmYTQ1YmYzZTI3ODY1NTAzZTMwM2I=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.1 - 2014-07-23
+
+* When daemonized, all output is now redirected to a file. It's `ost.log` by
+  default, but you can specify a different path via `-l`.
+
 # 0.1.0 - 2014-05-26
 
 * Moved to a threaded model.

data/bin/ost

@@ -14,7 +14,7 @@ trap(:TERM, &stop)
 usage = <<-EOS
 Usage:
 
-  ost start [-r <require>] [-d] [-p <pid-path>]
+  ost start [-r <require>] [-d] [-p <pid-path>] [-l <log-path>]
   ost stop [-p <pid-path>]
 
 EOS
@@ -29,6 +29,10 @@ opts = {
 command, _ = Clap.run ARGV,
   "-d" => -> {
     opts[:daemonize] = true
+    opts[:log_path] = File.expand_path("ost.log") unless opts.include?(:log_path)
+  },
+  "-l" => -> path {
+    opts[:log_path] = path
   },
   "-p" => -> path {
     opts[:pid_path] = path
@@ -81,6 +85,11 @@ when "start"
     end
   end
 
+  if opts[:log_path]
+    $stdout.reopen(opts[:log_path], "a")
+    $stderr.reopen(opts[:log_path], "a")
+  end
+
   load "./Ostfile"
 
   opts[:pool_size] = Ost.workers.size unless opts.include?(:pool_size)

data/lib/ost-bin/version.rb

@@ -1,5 +1,5 @@
 require "ost"
 
 module Ost::Bin
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/bin.rb

@@ -172,3 +172,61 @@ test "load Ostfile" do
     Process.kill(:INT, pid) if pid
   end
 end
+
+test "redirect stdout and stderr to a log file when daemonizing" do
+  pid, detached_pid = nil
+
+  pid_path = "./test/workers/logger/ost.pid"
+
+  log_path = "test/workers/logger/ost.log"
+
+  File.delete(log_path) if File.exist?(log_path)
+
+  begin
+    pid = spawn("#{root("bin/ost")} -d start", chdir: "test/workers/logger")
+
+    assert wait_for {
+      `ps -p #{pid} -o state`.lines.to_a.last[/(\w+)/, 1] == "Z"
+    }
+
+    redis.lpush("ost:Logger", 1)
+  ensure
+    detached_pid = read_pid_file(pid_path)
+
+    Process.kill(:INT, pid) if pid
+    Process.kill(:INT, detached_pid) if detached_pid
+  end
+
+  wait_for_pid(detached_pid)
+
+  assert_equal "out: 1\nerr: 1\n", File.read(log_path)
+end
+
+test "redirect stdout and stderr to a different log file when daemonizing" do
+  pid, detached_pid = nil
+
+  pid_path = "./test/workers/logger/ost.pid"
+
+  log_path = "test/workers/logger/foo.log"
+
+  File.delete(log_path) if File.exist?(log_path)
+
+  begin
+    pid = spawn("#{root("bin/ost")} -d -l foo.log start", chdir: "test/workers/logger")
+
+    assert wait_for {
+      `ps -p #{pid} -o state`.lines.to_a.last[/(\w+)/, 1] == "Z"
+    }
+
+    redis.lpush("ost:Logger", 1)
+  ensure
+    detached_pid = read_pid_file(pid_path)
+
+    Process.kill(:INT, pid) if pid
+    Process.kill(:INT, detached_pid) if detached_pid
+  end
+
+  wait_for_pid(detached_pid)
+
+  assert_equal "out: 1\nerr: 1\n", File.read(log_path)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ost-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Damian Janowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ost