summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-02-02 02:08:59 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-02-02 02:08:59 +0000
commita29118c6c3815cebdaad199da2996b3249586a26 (patch)
treeba9edad19d6ef31fb1c9c37164d7e2544b4b5b8f
parentdf1fbb27d834bd76432336190a6bead6779f09cc (diff)
downloaddeluge-a29118c6c3815cebdaad199da2996b3249586a26.tar.gz
deluge-a29118c6c3815cebdaad199da2996b3249586a26.tar.bz2
deluge-a29118c6c3815cebdaad199da2996b3249586a26.zip
Fix logging exceptions in the daemon
-rw-r--r--ChangeLog1
-rw-r--r--deluge/main.py8
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e221927a..3be6c937a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
Deluge 1.1.3 - (In Development)
Misc:
* Fix issue when initializing gettext that would prevent deluge from starting
+ * Fix logging exceptions when starting the daemon
Deluge 1.1.2 - (31 January 2009)
Core:
diff --git a/deluge/main.py b/deluge/main.py
index 7cb504374..d52be12ff 100644
--- a/deluge/main.py
+++ b/deluge/main.py
@@ -199,5 +199,9 @@ def start_daemon():
sys.stderr = None
sys.stdin = None
- from deluge.core.daemon import Daemon
- Daemon(options, args)
+ try:
+ from deluge.core.daemon import Daemon
+ Daemon(options, args)
+ except Exception, e:
+ from deluge.log import LOG as log
+ log.exception(e)