minor update

This commit is contained in:
Miroslav Stampar 2010-09-27 13:41:18 +00:00
parent cf17debf79
commit c6bf0e43af
3 changed files with 7 additions and 7 deletions

View File

@ -286,7 +286,7 @@ def start():
e += ", skipping to next url" e += ", skipping to next url"
logger.error(e) logger.error(e)
else: else:
logger.error(e) logger.critical(e)
return False return False
if conf.loggedToOut: if conf.loggedToOut:

View File

@ -98,7 +98,7 @@ class Google:
gpage = conf.googlePage if conf.googlePage > 1 else 1 gpage = conf.googlePage if conf.googlePage > 1 else 1
logger.info("using Google result page #%d" % gpage) logger.info("using Google result page #%d" % gpage)
if not googleDork: if not googleDork:
return None return None
@ -122,12 +122,12 @@ class Google:
page = decodePage(page, responseHeaders.get("Content-Encoding"), responseHeaders.get("Content-Type")) page = decodePage(page, responseHeaders.get("Content-Encoding"), responseHeaders.get("Content-Type"))
responseMsg = "HTTP response (%s - %d):\n" % (status, code) responseMsg = "HTTP response (%s - %d):\n" % (status, code)
if conf.verbose <= 4: if conf.verbose <= 4:
responseMsg += getUnicode(responseHeaders) responseMsg += getUnicode(responseHeaders)
elif conf.verbose > 4: elif conf.verbose > 4:
responseMsg += "%s\n%s\n" % (responseHeaders, page) responseMsg += "%s\n%s\n" % (responseHeaders, page)
logger.log(8, responseMsg) logger.log(8, responseMsg)
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
try: try:
@ -135,7 +135,7 @@ class Google:
except socket.timeout: except socket.timeout:
warnMsg = "connection timed out while trying " warnMsg = "connection timed out while trying "
warnMsg += "to get error page information (%d)" % e.code warnMsg += "to get error page information (%d)" % e.code
logger.warn(warnMsg) logger.critical(warnMsg)
return None return None
except (urllib2.URLError, socket.error, socket.timeout), _: except (urllib2.URLError, socket.error, socket.timeout), _:
errMsg = "unable to connect to Google" errMsg = "unable to connect to Google"

View File

@ -86,7 +86,7 @@ def main():
try: try:
init(cmdLineOptions) init(cmdLineOptions)
if conf.profile: if conf.profile:
profile() profile()
elif conf.smokeTest: elif conf.smokeTest:
smokeTest() smokeTest()
elif conf.liveTest: elif conf.liveTest:
@ -95,7 +95,7 @@ def main():
start() start()
except exceptionsTuple, e: except exceptionsTuple, e:
e = getUnicode(e) e = getUnicode(e)
logger.error(e) logger.critical(e)
closeDumper(False, e) closeDumper(False, e)
except KeyboardInterrupt, _: except KeyboardInterrupt, _: