Changeset 6e49a4 in indico

Timestamp:

03/17/11 10:30:42 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

a7950b

Parents:

ee1010

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (03/17/11 09:19:18)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/17/11 10:30:42)

Message:

[FIX] Don't sent past alarms

Location:

indico

Files:

• MaKaC/plugins/Collaboration/Vidyo/api/api.py (modified) (1 diff)
• modules/scheduler/tasks.py (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/Vidyo/api/api.py

@@ -120 +120 @@
 
         except WebFault, e:
-            Logger.get('Vidyo').info("""Evt:%s, booking:%s, Admin API's getRooms operation got WebFault: %s""" %
-                                    (confId, bookingId, e.fault.faultstring))
-            raise e
+            Logger.get('Vidyo').exception("""Evt:%s, booking:%s, Admin API's getRooms operation got WebFault: %s""" %
+                                    (confId, bookingId, e.fault.faultstring))
+            raise
 
         except Exception, e:

indico/modules/scheduler/tasks.py

@@ -360 +360 @@
         self.smtpServer = Config.getInstance().getSmtpServer()
 
-    def run(self, check=False):
+    def run(self, check=True):
         import smtplib
         from MaKaC.webinterface.mail import GenericMailer, GenericNotification
 
         # prepare the mail
-        self._prepare(check=check);
+        self._prepare(check=check)
 
         addrs = [smtplib.quoteaddr(x) for x in self.toAddr]