Skip to content

Commit 6c8ed8f

Browse files
committed
Bugfix: Avoid ps flag error on Linux
1 parent aaf4ce0 commit 6c8ed8f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* Bugfix: Fixed `rand` seeding in child processes.
44
* Bugfix: Better JSON encoding/decoding without Yajl.
5+
* Bugfix: Avoid `ps` flag error on Linux
56

67
## 1.2.2 (2009-12-08)
78

lib/resque/worker.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def shutdown!
246246
def kill_child
247247
if @child
248248
log! "Killing child at #{@child}"
249-
if system("ps -ho pid,state -p #{@child}")
249+
if system("ps -o pid,state -p #{@child}")
250250
Process.kill("KILL", @child) rescue nil
251251
else
252252
log! "Child #{@child} not found, restarting."

0 commit comments

Comments
 (0)