Changeset 52 for branches/3.0/turbomail/control.py

Timestamp:

10/26/07 05:48:32 (1 year ago)

Author:

amcgregor

Message:

TurboMail 3.0 is now usable: the smtp and debug providers are working, immediate and demand managers are good-to-go, and S/MIME signatures work, too\!

Files:

• branches/3.0/turbomail/control.py (modified) (3 diffs)

branches/3.0/turbomail/control.py

@@ -67 +67 @@
                 # Load the requested pool manager.
                 manager = turbomail.config.get("mail.manager", "immediate")
-                turbomail.manager = self.load_single_entry("turbomail.managers", manager).load()
-                if not turbomail.manager:
-                        turbomail.config.set("mail.on", False)
+                controller = self.load_single_entry("turbomail.managers", manager)
+                if not controller:
+                        turbomail.config.update({"mail.on": False})
                         log.error("Unable to locate %s manager, TurboMail disabled." % manager)
+                        self.stop(force=True)
                         return
+                turbomail.manager = controller.load()
                 turbomail.manager.start()
                 
                 # Load the requested mail provider.
                 provider = turbomail.config.get("mail.provider", "debug")
-                turbomail.provider = self.load_single_entry("turbomail.providers", provider).load()
-                if not turbomail.provider:
-                        turbomail.config.set("mail.on", False)
+                controller = self.load_single_entry("turbomail.providers", provider)
+                if not controller:
+                        turbomail.config.update({"mail.on": False})
                         log.error("Unable to locate %s provider, TurboMail disabled." % provider)
+                        self.stop(force=True)
                         return
+                turbomail.provider = controller.load()
                 turbomail.provider.start()
                 
@@ -94 +98 @@
                 self.running = True
         
-        def stop(self):
-                if not self.running: return
+        def stop(self, force=False):
+                if not self.running and not force: return
                 
                 log.info("TurboMail extension shutting down.")
@@ -104 +108 @@
                         if turbomail.config.get("mail." + entrypoint.name + ".on", False):
                                 ext = entrypoint.load()
-                                if hasattr(ext, "unload"): ext.unload()
+                                if hasattr(ext, "stop"): ext.stop()
                 
                 # Unload the provider and manager.
-                turbomail.provider.stop()
-                turbomail.manager.stop()
+                if turbomail.provider and hasattr(turbomail.provider, "stop"): turbomail.provider.stop()
+                if turbomail.manager and hasattr(turbomail.manager, "stop"): turbomail.manager.stop()
+                
+                turbomail.provider = None
+                turbomail.manager = None
                 
                 self.running = False