diff options
| author | ytti <saku@ytti.fi> | 2016-01-15 17:22:21 +0200 |
|---|---|---|
| committer | ytti <saku@ytti.fi> | 2016-01-15 17:22:21 +0200 |
| commit | d3ad5b63ed0cc98fd6923e1065597441552892d8 (patch) | |
| tree | 4720ea23e7ee317650b918e9807d78dc1f3a84e8 | |
| parent | 79188c8920d68a5923df6a17a822ccb896a87b32 (diff) | |
| parent | d46e75e7b90509e027ee256de850d0454dae1955 (diff) | |
Merge pull request #265 from Shopify/fix-issue-264
fixes issue #264
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/oxidized/cli.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b46ca2f..f60b12f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - oxidized (0.9.0) + oxidized (0.10.0) asetus (~> 0.1) net-ssh (~> 3.0, >= 3.0.2) rugged (~> 0.21, >= 0.21.4) diff --git a/lib/oxidized/cli.rb b/lib/oxidized/cli.rb index 15d20c5..d35eab3 100644 --- a/lib/oxidized/cli.rb +++ b/lib/oxidized/cli.rb @@ -24,7 +24,7 @@ module Oxidized Config.load(@opts) Oxidized.setup_logger - @pidfile = File.expand_path("pid") + @pidfile = File.join(Oxidized::Config::Root, 'pid') end def crash error |