Author: damoxc
Revision: 5157
Log:
improve the new style ui class to start the logging
Diff:
Modified: trunk/deluge/ui/ui.py
===================================================================
--- trunk/deluge/ui/ui.py 2009-04-24 18:50:54 UTC (rev 5156)
+++ trunk/deluge/ui/ui.py 2009-04-24 19:07:00 UTC (rev 5157)
@@ -26,8 +26,6 @@
import deluge.common
import deluge.configmanager
-from deluge.log import LOG as log
-
DEFAULT_PREFS = {
"default_ui": "gtk"
}
@@ -35,7 +33,6 @@
class _UI(object):
def __init__(self, name="gtk"):
- log.debug("NewUI init...")
self.__name = name
usage="%prog [options] [actions]",
@@ -69,13 +66,30 @@
@property
def args(self):
- return self._args
+ return self.__args
def start(self):
(self.__options, self.__args) = self.__parser.parse_args()
+ if self.options.quiet:
+ self.options.loglevel = "none"
+
+ # Setup the logger
+ import deluge.log
+ deluge.log.setupLogger(
+ level=self.options.loglevel,
+ filename=self.options.logfile
+ )
+
+ import deluge.common
+ log = deluge.log.LOG
+ log.info('Deluge %s ui %s', self.name, deluge.common.get_version())
+ log.debug('options: %s', self.options)
+ log.debug('args: %s', self.args)
+ log.info('Starting ui...')
class UI:
def __init__(self, options, args, ui_args):
+ from deluge.log import LOG as log
log.debug("UI init..")
# Set the config directory
Modified: trunk/deluge/ui/web/web.py
===================================================================
--- trunk/deluge/ui/web/web.py 2009-04-24 18:50:54 UTC (rev 5156)
+++ trunk/deluge/ui/web/web.py 2009-04-24 19:07:00 UTC (rev 5157)
@@ -22,7 +22,6 @@
# Boston, MA 02110-1301, USA.
#
-import server
from deluge.ui.ui import _UI, UI
from optparse import OptionGroup
@@ -38,7 +37,7 @@
def __init__(self):
super(Web, self).__init__("web")
- self.__server = server.DelugeWeb()
+ self.__server = None
group = OptionGroup(self.parser, "Web Options")
group.add_option("-p", "--port", dest="port", type="int",
@@ -52,7 +51,13 @@
def start(self):
super(Web, self).start()
- if self.options.port: self.server.port = self.options.port
+
+ import server
+ self.__server = server.DelugeWeb()
+
+ if self.options.port:
+ self.server.port = self.options.port
+
self.server.start()
def start():
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
