Fixed symbol vs string match bug

gip · Feb 7, 2012 · 0d0e7a8 · 0d0e7a8
1 parent 774263f
commit 0d0e7a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 73 deletions.
diff --git a/config/example/telework_config.rb b/config/example/telework_config.rb
diff --git a/lib/resque-telework/manager.rb b/lib/resque-telework/manager.rb
@@ -7,8 +7,8 @@ class Manager
 
         def initialize(cfg)
           @RUN_DAEMON= true
-          @HOST= cfg[:hostname]
+          @HOST= cfg['hostname']
-          @SLEEP= cfg[:daemon_pooling_interval]
+          @SLEEP= cfg['daemon_pooling_interval']
           @WORKERS= {}
           @STOPPED= []
         end
@@ -48,6 +48,7 @@ def start
           send_status( 'Error', "Exit called in #{@HOST} daemon but workers are still running") unless @WORKERS.empty?
         rescue Exception => e    # Other exceptions
           send_status( 'Error', "Exception #{e.message}")
+          puts "Backtrace: #{e.backtrace}"
           send_status( 'Error', "Exception should not be raised in the #{@HOST} daemon, please submit a bug report")
         end
 

diff --git a/lib/tasks/telework.rake b/lib/tasks/telework.rake
@@ -3,23 +3,23 @@ namespace :telework do
   desc 'Register a new revision into Telework'
   task :register_revision => :environment do     
     cfg= get_config
-    host= cfg[:hostname]
+    host= cfg['hostname']
-    cfg.delete(:hostname)
+    cfg.delete('hostname')
     TeleworkRedis.new.register_revision(host, cfg)
   end
 
   desc 'Start a Telework daemon on this machine and returns'
   task :start_daemon => :environment do
     cfg= get_config
-    host= cfg[:hostname]
+    host= cfg['hostname']
     daemon= Resque::Plugins::Telework::Manager.new(cfg)
     if daemon.is_alive(host)
       msg= "There is already a daemon running on #{host}"
       daemon.send_status( 'Error', msg)
       daemon.send_status( 'Error', "This daemon (PID #{Process.pid}) cannot be started and will terminare now")
       return nil
     end
-    logp= cfg[:daemon_log_path]
+    logp= cfg['daemon_log_path']
     logp||= "."
     logf= "#{logp}/telework_daemon.log"
     lpid= "#{logp}/telework_daemon.pid"
@@ -46,7 +46,7 @@ namespace :telework do
 
   def get_config
     # TODO: look into TELEWORK_CONFIG_FILE
-    ch= { :hostname => find_hostname }
+    ch= { 'hostname' => find_hostname }
     ActiveSupport::JSON.decode(open("telework_config.log", "r").read).merge(ch)
   end