Rescue Object in run:remote also LM/BH

brynary · Apr 30, 2009 · e8439e0 · e8439e0
1 parent f344d15
commit e8439e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/lib/testjour/commands/run_remote.rb b/lib/testjour/commands/run_remote.rb
@@ -13,31 +13,28 @@ module Commands
   class RunRemote < RunSlave
 
     def execute
-      Signal.list.each do |name, code|
-        next if name == "VTALRM"
-
-        Signal.trap(code) do
-          Testjour.logger.info "Received signal: #{code}"
-        end
-      end
-
       configuration.parse!
       configuration.parse_uri!
 
-      # raise configuration.rsync_uri.inspect
-
       Dir.chdir(configuration.in) do
         Testjour.setup_logger(configuration.in)
-        Testjour.logger.info "Starting run:slave"
-        
+        Testjour.logger.info "Starting run:remote"
+
         rsync
-        Testjour.logger.info "Setup"
-        configuration.setup
-        configuration.setup_mysql
-        Testjour.logger.info "Requiring"
-        require_files
-        Testjour.logger.info "Working"
-        work
+
+        begin
+          Testjour.logger.info "Setup"
+          configuration.setup
+          configuration.setup_mysql
+          Testjour.logger.info "Requiring"
+          require_files
+          Testjour.logger.info "Working"
+
+          work
+        rescue Object => ex
+          Testjour.logger.error "run:remote error: #{ex.message}"
+          Testjour.logger.error ex.backtrace.join("\n")
+        end
       end
     end
 

diff --git a/lib/testjour/commands/run_slave.rb b/lib/testjour/commands/run_slave.rb
@@ -12,14 +12,6 @@ module Commands
   class RunSlave < Command
 
     def execute
-      Signal.list.each do |name, code|
-        next if name == "VTALRM"
-
-        Signal.trap(code) do
-          Testjour.logger.info "Received signal: #{code}"
-        end
-      end
-
       configuration.parse!
       configuration.parse_uri!