Merge "Catch exceptions inside blocks passed to fiber pools."

cloudfoundry-attic · Sep 10, 2012 · f3158e1 · f3158e1
2 parents 91a631b + 2e1bedf
commit f3158e1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/cloud_controller/app/subscriptions/dea_advertise_channel.rb b/cloud_controller/app/subscriptions/dea_advertise_channel.rb
@@ -3,12 +3,19 @@
   NATS.subscribe('dea.advertise') do |msg|
     begin
       payload = Yajl::Parser.parse(msg, :symbolize_keys => true)
-      CloudController::UTILITY_FIBER_POOL.spawn do
-        DEAPool.process_advertise_message(payload)
-      end
     rescue => e
-      CloudController.logger.error("Exception processing dea advertisement: '#{msg}'")
+      CloudController.logger.error("Failed parsing DEA advertisement #{msg} : #{e}")
       CloudController.logger.error(e)
+      next
+    end
+
+    CloudController::UTILITY_FIBER_POOL.spawn do
+      begin
+        DEAPool.process_advertise_message(payload)
+      rescue => e
+        CloudController.logger.error("Failed processing dea advertisement: '#{msg}'")
+        CloudController.logger.error(e)
+      end
     end
   end
   NATS.publish('dea.locate')

diff --git a/cloud_controller/app/subscriptions/health_manager_channel.rb b/cloud_controller/app/subscriptions/health_manager_channel.rb
@@ -12,12 +12,19 @@
   NATS.subscribe("cloudcontrollers.hm.requests.#{AppConfig[:cc_partition]}", :queue => :cc) do |msg|
     begin
       payload = Yajl::Parser.parse(msg, :symbolize_keys => true)
-      CloudController::UTILITY_FIBER_POOL.spawn do
-        App.process_health_manager_message(payload)
-      end
     rescue => e
-      CloudController.logger.error("Exception processing health manager request: '#{msg}'")
+      CloudController.logger.error("Failed parsing HM request #{msg} : #{e}")
       CloudController.logger.error(e)
+      next
+    end
+
+    CloudController::UTILITY_FIBER_POOL.spawn do
+      begin
+        App.process_health_manager_message(payload)
+      rescue => e
+        CloudController.logger.error("Failed processing HM request #{msg}: #{e}")
+        CloudController.logger.error(e)
+      end
     end
   end