Changeset a7950b 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:

933d9d

Parents:

6e49a4

git-author:

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

git-committer:

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

Message:

[FIX] Alarm cloning

Location:

indico

Files:

• MaKaC/conference.py (modified) (1 diff)
• modules/scheduler/tasks.py (modified) (8 diffs)

indico/MaKaC/conference.py

@@ -4229 +4229 @@
         if options.get("alerts",False) :
             for alarm in self.getAlarmList() :
-                conf.addAlarm(alarm.clone(conf))
+                # .clone takes care of enqueuing it
+                alarm.clone(conf)
         # Meetings' and conferences' contributions cloning
         if options.get("contributions",False) :

indico/modules/scheduler/tasks.py

@@ -360 +360 @@
         self.smtpServer = Config.getInstance().getSmtpServer()
 
+    def _prepare(self, check):
+        """
+        Overloaded by descendants
+        """
+
     def run(self, check=True):
         import smtplib
@@ -365 +370 @@
 
         # prepare the mail
-        self._prepare(check=check)
+        send = self._prepare(check=check)
+
+        # _prepare decided we shouldn't send the mail?
+        if not send:
+            return
 
         addrs = [smtplib.quoteaddr(x) for x in self.toAddr]
@@ -371 +380 @@
 
         if len(addrs) + len(ccaddrs) == 0:
-            self._v_logger.warning("Attention: mail contains no recipients!")
+            self.getLogger().warning("Attention: mail contains no recipients!")
         else:
-            self._v_logger.info("Sending mail To: %s, CC: %s" % (addrs, ccaddrs))
+            self.getLogger().info("Sending mail To: %s, CC: %s" % (addrs, ccaddrs))
 
         for user in self.toUser:
@@ -383 +392 @@
                                                 "subject": self.subject,
                                                 "body": self.text }))
-
-    def getConference(self):
-        return self.conf
 
     def setFromAddr(self, addr):
@@ -465 +471 @@
         self._confRelId = confRelId
 
+    def getConference(self):
+        return self.conf
+
     def getConfRelativeId(self):
         return self._confRelId
@@ -479 +488 @@
 
     def clone(self, conference):
-        alarm = AlarmTask(conference)
-        alarm.initialiseToAddr()
+        """
+        Clone the alarm, changing only the conference
+        """
+        alarm = conference.newAlarm(self.getStartOn())
         for addr in self.getToAddrList():
             alarm.addToAddr(addr)
         alarm.setFromAddr(self.getFromAddr())
         alarm.setSubject(self.getSubject())
-        alarm.setConfSumary(self.getConfSumary())
+        alarm.setConfSummary(self.getConfSummary())
         alarm.setNote(self.getNote())
         alarm.setText(self.getText())
@@ -570 +581 @@
             from MaKaC.conference import ConferenceHolder
             if not ConferenceHolder().hasKey(self.conf.getId()):
-                self._logger.warning("Conference %s no longer exists! "
+                self.getLogger().warning("Conference %s no longer exists! "
                                      "Deleting alarm." % self.conf.getId())
                 self.conf.removeAlarm(self)
             elif self.conf.getStartDate() <= self._getCurrentDateTime():
-                self._logger.warning("Conference %s already started. "
+                self.getLogger().warning("Conference %s already started. "
                                      "Deleting alarm." % self.conf.getId())
                 self.conf.removeAlarm(self)
-                return True
+                return False
 
         # Email
@@ -617 +628 @@
                 ))
         self._setMailText()
-        return False
+        return True