r4sas/py-i2phosts
1
0
Fork 0
mirror of https://github.com/r4sas/py-i2phosts synced 2025-02-08 12:54:23 +00:00
Code Issues Releases Wiki Activity

py-i2phosts-fetcher: replace print() and sys.std*() with log.<level>()

Browse Source
This commit is contained in:
Hidden Z 2010-10-30 17:55:37 +00:00
parent 31e1cb0706
commit a7d98d8cf5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
py-i2phosts-fetcher
View File

@ -68,8 +68,8 @@ for source in config['sources']:
if e.errno == errno.ENOENT: if e.errno == errno.ENOENT:
pass pass
else: else:
sys.stderr.write('fatal error: %s', e) log.critical('fatal error: %s', e)
os.exit(1) sys.exit(1)
else: else:
last_modified = time.strftime('%a, %d %b %Y %H:%M:%S GMT', time.localtime(mtime)) last_modified = time.strftime('%a, %d %b %Y %H:%M:%S GMT', time.localtime(mtime))
# prevent redownloading of hosts-file by passing If-Modified-Since http header # prevent redownloading of hosts-file by passing If-Modified-Since http header
@ -78,13 +78,13 @@ for source in config['sources']:
resp = opener.open(source, timeout=60) resp = opener.open(source, timeout=60)
except urllib2.URLError, e: except urllib2.URLError, e:
if hasattr(e, 'reason'): if hasattr(e, 'reason'):
print 'failed to reach server %s, reason: %s' % (source_hostname, e.reason) log.warning('failed to reach server %s, reason: %s', source_hostname, e.reason)
elif hasattr(e, 'code'): elif hasattr(e, 'code'):
if e.code == 304: if e.code == 304:
print '%s: not modified' % source_hostname log.info('%s: not modified', source_hostname)
else: else:
print 'server %s can\'t finish the request, error code: %s' \ log.warning('server %s can\'t finish the request, error code: %s',
% (source_hostname, e.code) source_hostname, e.code)
continue continue
# read data from remote and write it to local file # read data from remote and write it to local file
content = resp.read() content = resp.read()
@ -93,14 +93,14 @@ for source in config['sources']:
f.close() f.close()
# get last-modified info from header and change file's mtime # get last-modified info from header and change file's mtime
lm = resp.headers.get('Last-Modified') lm = resp.headers.get('Last-Modified')
print '%s: %s' % (source_hostname, lm) log.debug('%s Last-Modified: %s', source_hostname, lm)
if lm: if lm:
target_mtime = int(time.mktime(time.strptime(lm, '%a, %d %b %Y %H:%M:%S GMT'))) target_mtime = int(time.mktime(time.strptime(lm, '%a, %d %b %Y %H:%M:%S GMT')))
os.utime(filename, (target_mtime, target_mtime)) os.utime(filename, (target_mtime, target_mtime))
# form commnd-line for invoke injector # form commnd-line for invoke injector
path = os.path.dirname(sys.argv[0]) path = os.path.dirname(sys.argv[0])
print 'adding hosts from: %s' % source_hostname log.info('adding hosts from: %s', source_hostname)
sp_args = [path + '/py-i2phosts-injector', '-s', '-a', '-f', filename, '-d', sp_args = [path + '/py-i2phosts-injector', '-s', '-a', '-f', filename, '-d',
'Auto-added from ' + source_hostname] 'Auto-added from ' + source_hostname]
p = subprocess.Popen(sp_args, shell=False, stdin=None, p = subprocess.Popen(sp_args, shell=False, stdin=None,