r193 - in /debtorrent/trunk: DebTorrent/BT1/track.py DebTorrent/download_bt1.py debtorrent-client.conf debtorrent-client.py
camrdale-guest at users.alioth.debian.org
camrdale-guest at users.alioth.debian.org
Tue Jul 31 05:37:26 UTC 2007
Author: camrdale-guest
Date: Tue Jul 31 05:37:26 2007
New Revision: 193
URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=193
Log:
Fixed a bug that prevented proper logging when a config file was used.
Change default log level to 10 (debug).
Modified:
debtorrent/trunk/DebTorrent/BT1/track.py
debtorrent/trunk/DebTorrent/download_bt1.py
debtorrent/trunk/debtorrent-client.conf
debtorrent/trunk/debtorrent-client.py
Modified: debtorrent/trunk/DebTorrent/BT1/track.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/track.py?rev=193&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/track.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/track.py Tue Jul 31 05:37:26 2007
@@ -1464,6 +1464,7 @@
configdefaults = {}
try:
+ # Load the configuration data
configdir = ConfigDir('debtorrent-client')
defaultsToIgnore = ['configfile']
configdir.setDefaults(defaults,defaultsToIgnore)
@@ -1473,20 +1474,30 @@
"(only for debtorrent-tracker.py)"))
config, files = parseargs(params, defaults, 0, 0, configdefaults)
configdir.setCacheDir(config['cache_dir'], False)
+ if config['log_dir']:
+ outfilename = os.path.join(config['log_dir'], 'debtorrent-tracker.log')
+ logfile = os.path.join(config['log_dir'], 'tracker-access.log')
+ else:
+ outfilename = os.path.join(configdir.cache_dir, 'debtorrent-tracker.log')
+ logfile = os.path.join(configdir.cache_dir, 'tracker-access.log')
+
+ # Create the root handler (removing any others)
+ hdlr = logging.FileHandler(outfilename, 'a')
+ hdlr.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s'))
+ for h in logging.root.handlers:
+ logging.root.removeHandler(h)
+ logging.root.addHandler(hdlr)
+ logging.root.setLevel(config['log_level'])
+ logging.info('Logging begins')
+
+ # Continue
if config['save_options']:
configdir.saveConfig(config)
- if config['log_dir']:
- outfilename = os.path.join(config['log_dir'], 'debtorrent-tracker.log')
- else:
- outfilename = os.path.join(configdir.cache_dir, 'debtorrent-tracker.log')
- logging.basicConfig(level=config['log_level'],
- format='%(asctime)s %(levelname)s %(message)s',
- filename=outfilename,
- filemode='a')
except ValueError, e:
- print 'error: ' + str(e)
- print "Usage: debtorrent-tracker.py <global options>\n"
- print formatDefinitions(defaults, 80)
+ logging.error('error: ' + str(e))
+ logging.error("Usage: debtorrent-tracker.py <global options>")
+ logging.error(formatDefinitions(defaults, 80))
+ logging.shutdown()
sys.exit(1)
r = RawServer(Event(), config['timeout_check_interval'],
@@ -1497,16 +1508,12 @@
r.bind(config['port'], config['bind'],
reuse = True, ipv6_socket_style = config['ipv6_binds_v4'])
- if config['log_dir']:
- logfile = os.path.join(config['log_dir'], 'tracker-access.log')
- else:
- logfile = os.path.join(configdir.cache_dir, 'tracker-access.log')
-
r.listen_forever(HTTPHandler(t.get, config['min_time_between_log_flushes'],
logfile, config['hupmonitor']))
t.save_state()
- logging.info('# Shutting down: ' + isotime())
+ logging.info('Shutting down')
+ logging.shutdown()
def size_format(s):
"""Format a byte size for reading by the user.
Modified: debtorrent/trunk/DebTorrent/download_bt1.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/download_bt1.py?rev=193&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/download_bt1.py (original)
+++ debtorrent/trunk/DebTorrent/download_bt1.py Tue Jul 31 05:37:26 2007
@@ -76,7 +76,7 @@
'(0 = disabled)'),
('log_dir', '',
'directory to write the logfiles to (default is to use the cache directory)'),
- ('log_level', 30,
+ ('log_level', 10,
'level to write the logfiles at, varies from 10 (debug) to 50 (critical)'),
# Rate limits
('max_upload_rate', 0,
Modified: debtorrent/trunk/debtorrent-client.conf
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debtorrent-client.conf?rev=193&op=diff
==============================================================================
--- debtorrent/trunk/debtorrent-client.conf (original)
+++ debtorrent/trunk/debtorrent-client.conf Tue Jul 31 05:37:26 2007
@@ -80,7 +80,7 @@
# 10 -- Debug
#
-# log_level = 30
+# log_level = 10
###############################################################################
# R A T E L I M I T S
Modified: debtorrent/trunk/debtorrent-client.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debtorrent-client.py?rev=193&op=diff
==============================================================================
--- debtorrent/trunk/debtorrent-client.py (original)
+++ debtorrent/trunk/debtorrent-client.py Tue Jul 31 05:37:26 2007
@@ -40,6 +40,7 @@
configdefaults = {}
try:
+ # Load the configuration data
configdir = ConfigDir('debtorrent-client')
defaultsToIgnore = ['configfile']
configdir.setDefaults(defaults,defaultsToIgnore)
@@ -49,27 +50,39 @@
"(only for debtorrent-client.py)"))
config, args = parseargs(params, defaults, 0, 0, configdefaults)
configdir.setCacheDir(config['cache_dir'])
- if config['save_options']:
- configdir.saveConfig(config)
- configdir.deleteOldCacheData(config['expire_cache_data'])
if config['log_dir']:
outfilename = os.path.join(config['log_dir'], 'debtorrent-client.log')
else:
outfilename = os.path.join(configdir.cache_dir, 'debtorrent-client.log')
- logging.basicConfig(level=config['log_level'],
- format='%(asctime)s %(levelname)s %(message)s',
- filename=outfilename,
- filemode='a')
+
+ # Create the root handler (removing any others)
+ hdlr = logging.FileHandler(outfilename, 'a')
+ hdlr.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s'))
+ for h in logging.root.handlers:
+ logging.root.removeHandler(h)
+ logging.root.addHandler(hdlr)
+ logging.root.setLevel(config['log_level'])
+ logging.info('Logging begins')
+
+ # Continue
+ if config['save_options']:
+ configdir.saveConfig(config)
+ configdir.deleteOldCacheData(config['expire_cache_data'])
except ValueError, e:
- print 'error: ' + str(e) + '\n'
- print "Usage: debtorrent-client.py <global options>\n"
- print get_usage(defaults, 80, configdefaults)
+ logging.error('error: ' + str(e))
+ logging.error("Usage: debtorrent-client.py <global options>")
+ logging.error(get_usage(defaults, 80, configdefaults))
+ logging.shutdown()
exit(1)
except IOError, e:
logging.exception('error: ' + str(e))
+ logging.shutdown()
exit(2)
LaunchMany(config, configdir)
+
+ logging.info('Shutting down')
+ logging.shutdown()
if __name__ == '__main__':
if argv[1:2] == ['--version']:
More information about the Debtorrent-commits
mailing list