Skip to content

Commit

Permalink
Merge pull request resque#885 from strzalek/typo
Browse files Browse the repository at this point in the history
Typo in word 'daemon'
  • Loading branch information
steveklabnik committed Mar 21, 2013
2 parents 5e7a83d + 15d4851 commit 8c63044
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/resque/cli.rb
Expand Up @@ -12,7 +12,7 @@ class CLI < Thor
option :require, :aliases => ["-r"], :type => :string, :default => "."
option :pid, :aliases => ["-p"], :type => :string
option :interval, :aliases => ["-i"], :type => :numeric, :default => 5
option :deamon, :aliases => ["-d"], :type => :boolean, :default => false
option :daemon, :aliases => ["-d"], :type => :boolean, :default => false
option :timeout, :aliases => ["-t"], :type => :numeric, :default => 4.0
def work
load_config
Expand All @@ -22,7 +22,7 @@ def work

worker.term_timeout = Resque.config.timeout

if Resque.config.deamon
if Resque.config.daemon
Process.daemon(true)
end

Expand Down
2 changes: 1 addition & 1 deletion lib/resque/config.rb
Expand Up @@ -6,7 +6,7 @@ class Config

def initialize(options = {})
@options = {
:deamon => env(:background) || false,
:daemon => env(:background) || false,
:count => env(:count) || 5,
:failure_backend => env(:failure_backend) || "redis",
:fork_per_job => env(:fork_per_job).nil? || env(:fork_per_job) == "true",
Expand Down
2 changes: 1 addition & 1 deletion test/resque/config_test.rb
Expand Up @@ -4,7 +4,7 @@
describe Resque::Config do
it "defaults" do
defaults = {
:deamon => false,
:daemon => false,
:count => 5,
:failure_backend => "redis",
:fork_per_job => true,
Expand Down

0 comments on commit 8c63044

Please sign in to comment.