From 2192742dc272151723334a46e9f17a38add9a947 Mon Sep 17 00:00:00 2001 From: Mathias Rav Date: Sun, 30 Jul 2017 11:26:15 +0200 Subject: [PATCH] Use new emailtunnel run() method --- tutormail/__main__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tutormail/__main__.py b/tutormail/__main__.py index e03b8b1..18554f1 100644 --- a/tutormail/__main__.py +++ b/tutormail/__main__.py @@ -48,13 +48,11 @@ def main(): server = TutorForwarder( receiver_host, receiver_port, relay_host, relay_port) try: - asyncore.loop(timeout=0.1, use_poll=True) - except KeyboardInterrupt: - logging.info('TutorForwarder exited via KeyboardInterrupt') - except: + server.run() + except Exception as exn: logging.exception('TutorForwarder exited via exception') else: - logging.error('TutorForwarder exited via asyncore.loop returning') + logging.info('TutorForwarder exiting') if __name__ == "__main__":