Kolab Groupware OBS

Changes of Revision 15

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

@@ -389,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("Creating SMTPChannel for accepted message"), level=8)
+                    log.debug(
+                        _l("Accepted connection %r with address %r") % (
+                            connection, address 
+                        ),
+                        level=8
+                    )
 
                     def callback(filename):
                         self.pool.apply_async(pickup_message, (filename, (self.modules)))
-                        self.current_connections -= 1
 
-                    channel = WallaceSMTPChannel(connection, address, callback)
-                    channel.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."))