Permalink
Browse files

Merge branch 'per_worker_config' into glyde_stable

  • Loading branch information...
2 parents 00359bb + 542244b commit f4d43fe0577ce7929fe3dd6dbeca3daec2bb11ee Seth Morabito committed Oct 24, 2008
Showing with 6 additions and 2 deletions.
  1. +6 −2 server/lib/meta_worker.rb
@@ -356,9 +356,13 @@ def worker_config
# Returns the appropriate configuration value, based on both the
# global config and the per-worker configuration for this worker.
def get_config_value(key_sym, default)
- worker_config[key_sym] ||
- BDRB_CONFIG[:backgroundrb][key_sym] ||
+ if !worker_config[key_sym].nil?
+ worker_config[key_sym]
+ elsif !BDRB_CONFIG[:backgroundrb][key_sym].nil?
+ BDRB_CONFIG[:backgroundrb][key_sym]
+ else
default
+ end
end
def load_rails_env

0 comments on commit f4d43fe

Please sign in to comment.