Browse Source

py-i2phosts-fetcher: add error handling for invoking injector

py-i2phosts-injector may not be launched correctly, so we want to catch
the errors.
pull/1/head
Hidden Z 11 years ago
parent
commit
c280268486
  1. 11
      bin/py-i2phosts-fetcher

11
bin/py-i2phosts-fetcher

@ -4,6 +4,7 @@ import re
import os import os
import os.path import os.path
import sys import sys
import errno
import datetime import datetime
import urllib2 import urllib2
import subprocess import subprocess
@ -117,8 +118,14 @@ for source in all_sources:
log.info('%s: adding hosts...', source.name) log.info('%s: adding hosts...', source.name)
sp_args = ['py-i2phosts-injector', '-s', '-f', tmpfile, '-d', sp_args = ['py-i2phosts-injector', '-s', '-f', tmpfile, '-d',
'Auto-added from ' + source.name] 'Auto-added from ' + source.name]
p = subprocess.Popen(sp_args, shell=False, stdin=None, try:
stdout=subprocess.PIPE, stderr=subprocess.STDOUT) p = subprocess.Popen(sp_args, shell=False, stdin=None,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
except OSError, e:
log.error('failed to exec py-i2phosts-injector: %s', e)
if e.errno == errno.ENOENT:
log.error('check your PATH environment variable')
sys.exit(1)
out = p.communicate()[0] out = p.communicate()[0]
os.remove(tmpfile) os.remove(tmpfile)
log.info('%s: injector output: \n%s', source.name, out) log.info('%s: injector output: \n%s', source.name, out)

Loading…
Cancel
Save