Kolab Groupware OBS

debian.changelog Changed

pykolab-0.9.0.tar.gz/wallace/__init__.py Changed

@@ -154,6 +154,50 @@
             break
 
 
+class WallaceSMTPChannel(smtpd.SMTPChannel):
+    callback = None
+
+    def __init__(self, connection, address, callback):
+        self.callback = callback
+        if conf.debuglevel > 8:
+            smtpd.DEBUGSTREAM = pykolab.logger.StderrToLogger(log)
+        super().__init__(self, connection, address)
+
+    def data_header(self, mailfrom, rcpttos):
+        return "X-Kolab-From: " + mailfrom + "\r\n" + \
+            "X-Kolab-To: " + ', '.join(rcpttos) + "\r\n"
+
+    def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
+        """
+            We have retrieved the message. This should be as fast as possible,
+            and not ever block.
+        """
+
+        header = self.data_header(mailfrom, rcpttos)
+
+        try:
+            (fp, filename) = tempfile.mkstemp(dir="/var/spool/pykolab/wallace/")
+
+            # @TODO: and add line separator (\n or \r\n?)
+            # we should make sure there's only one line separator between
+            # kolab headers and the original message (data)
+            os.write(fp, bytes(header.encode("UTF-8")))
+            os.write(fp, data)
+        except Exception as errmsg:
+            log.warning(
+                _l("failed to write to file: %s" % (errmsg))
+            )
+        finally:
+            os.close(fp)
+
+        self.callback(filename)
+
+        return "250 OK Message %s queued" % (filename)
+
+    def loop(self):
+        asyncore.loop()
+
+
 class WallaceDaemon:
     heartbeat = None
     timer = None
@@ -345,25 +389,22 @@
                     time.sleep(0.5)
 
                 pair = s.accept()
-                log.debug(
-                    _l("Accepted connection %r with address %r") % (
-                        pair if pair is not None else (None, None)
-                    ),
-                    level=8
-                )
 
                 if pair is not None:
-                    self.current_connections += 1
                     connection, address = pair
+                    log.debug(
+                        _l("Accepted connection %r with address %r") % (
+                            connection, address 
+                        ),
+                        level=8
+                    )
 
-                    _smtpd = smtpd
-                    # Set DEBUGSTREAM of smtpd to log to pykolab logger
-                    if conf.debuglevel > 8:
-                        _smtpd.DEBUGSTREAM = pykolab.logger.StderrToLogger(log)
+                    def callback(filename):
+                        self.pool.apply_async(pickup_message, (filename, (self.modules)))
 
-                    log.debug(_l("Creating SMTPChannel for accepted message"), level=8)
-                    _smtpd.SMTPChannel(self, connection, address)
-                    asyncore.loop()
+                    self.current_connections += 1
+                    WallaceSMTPChannel(connection, address, callback).loop()
+                    self.current_connections -= 1
                 else:
                     log.error(_l("Socket accepted, but (conn, address) tuple is None."))
 
@@ -378,13 +419,6 @@
         self.timer.cancel()
         self.timer.join()
 
-    # pylint: disable=no-self-use
-    def data_header(self, mailfrom, rcpttos):
-        COMMASPACE = ', '
-
-        return "X-Kolab-From: " + mailfrom + "\r\n" + \
-            "X-Kolab-To: " + COMMASPACE.join(rcpttos) + "\r\n"
-
     def pickup_spool_messages(self, sync=False):
         # Mind you to include the trailing slash
         pickup_path = '/var/spool/pykolab/wallace/'
@@ -474,30 +508,6 @@
 
             self.current_connections -= 1
 
-    def process_message(self, peer, mailfrom, rcpttos, data):
-        """
-            We have retrieved the message. This should be as fast as possible,
-            and not ever block.
-        """
-
-        header = self.data_header(mailfrom, rcpttos)
-
-        (fp, filename) = tempfile.mkstemp(dir="/var/spool/pykolab/wallace/")
-
-        # @TODO: and add line separator (\n or \r\n?)
-        # we should make sure there's only one line separator between
-        # kolab headers and the original message (data)
-        os.write(fp, header)
-        os.write(fp, data)
-        os.close(fp)
-
-        log.debug(_l("Started processing accepted message %s") % filename, level=8)
-        self.pool.apply_async(pickup_message, (filename, (self.modules)))
-
-        self.current_connections -= 1
-
-        return "250 OK Message %s queued" % (filename)
-
     def reload_config(self, *args, **kwargs):
         pass

pykolab-0.9.0.tar.gz/wallace/modules.py Changed

pykolab.dsc Changed

Changes of Revision 7