lib/taskjuggler/daemon/ReportServer.rb in taskjuggler-3.3.0 vs lib/taskjuggler/daemon/ReportServer.rb in taskjuggler-3.4.0

@@ -177,13 +177,16 @@
 
     def startWatchDog
       Thread.new do
         loop do
           if TjTime.new - @lastPing > 120
-            error('ps_heartbeat_lost',
-                  "Report server (Project #{@tj.project['projectid']} " +
-                  "report #{@reportId}) lost heartbeat " +
-                  'from ProjectServer. Terminating.')
+            # Since the abort via error() is not thread safe, we issue a
+            # warning and abort manually.
+            warning('ps_heartbeat_lost',
+                    "Report server (Project #{@tj.project['projectid']} " +
+                    "report #{@reportId}) lost heartbeat " +
+                    'from ProjectServer. Terminating.')
+            exit 1
           end
           sleep 30
         end
       end
     end