Module: deluge Branch: multiuser Commit: 5841521133f8bc1b761d6330c41312f8e83cb79d
Author: Pedro Algarvio <[email protected]> Date: Tue Dec 28 01:26:25 2010 +0000 Added missing import. Removed log message that caused error. It was never logged anyway, even on the master branch before the improved logging branch was created. --- deluge/configmanager.py | 1 - deluge/log.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deluge/configmanager.py b/deluge/configmanager.py index 8494e25..dc92a53 100644 --- a/deluge/configmanager.py +++ b/deluge/configmanager.py @@ -55,7 +55,6 @@ class _ConfigManager: return self.__config_directory def __del__(self): - log.debug("ConfigManager stopping..") del self.config_files def set_config_dir(self, directory): diff --git a/deluge/log.py b/deluge/log.py index 86acf2a..b014fa9 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -37,8 +37,8 @@ """Logging functions""" import os -import logging import inspect +import logging from deluge import common from twisted.internet import defer from twisted.python.log import PythonLoggingObserver @@ -155,6 +155,7 @@ def setupLogger(level="error", filename=None, filemode="w"): delay=0 ) elif filename and filemode=='w': + import logging.handlers handler = getattr( logging.handlers, 'WatchedFileHandler', logging.FileHandler)( filename, filemode, 'utf-8', delay=0 -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
