1 files changed, 4 insertions, 3 deletions
diff --git a/deluge/core/alertmanager.py b/deluge/core/alertmanager.py
index a4464eb8c..bcc60fedf 100644
--- a/deluge/core/alertmanager.py
+++ b/deluge/core/alertmanager.py
@@ -67,12 +67,12 @@ class AlertManager(component.Component):
 
         # handlers is a dictionary of lists {"alert_type": [handler1,h2,..]}
         self.handlers = {}
-
         self.delayed_calls = []
+        self.wait_on_handler = False
 
     def update(self):
         self.delayed_calls = [dc for dc in self.delayed_calls if dc.active()]
-        self.handle_alerts()
+        self.handle_alerts(wait=self.wait_on_handler)
 
     def stop(self):
         for dc in self.delayed_calls:
@@ -123,7 +123,8 @@ class AlertManager(component.Component):
         while alert is not None:
             alert_type = type(alert).__name__
             # Display the alert message
-            log.debug("%s: %s", alert_type, decode_string(alert.message()))
+            if log.isEnabledFor(logging.DEBUG):
+                log.debug("%s: %s", alert_type, decode_string(alert.message()))
             # Call any handlers for this alert type
             if alert_type in self.handlers:
                 for handler in self.handlers[alert_type]: