Skip to content

Commit aee3665

Browse files
committed
Tweaked the test-crawler to give the same log line format for exception failures as for regular log lines.
- Legacy-Id: 10936
1 parent 0005027 commit aee3665

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

bin/test-crawl

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,24 @@ if __name__ == "__main__":
291291
if skip_url(url):
292292
continue
293293

294+
timestamp = datetime.datetime.now()
295+
acc_time = (timestamp - start_time).total_seconds()
296+
acc_secs = (timestamp - start_time).total_seconds()
297+
hrs = acc_secs // (60*60)
298+
min = (acc_secs % (60*60)) // 60
299+
sec = acc_secs % 60
300+
294301
try:
295-
timestamp = datetime.datetime.now()
302+
request_start = datetime.datetime.now()
296303
r = client.get(url, secure=True, follow=True)
297-
elapsed = datetime.datetime.now() - timestamp
304+
elapsed = datetime.datetime.now() - request_start
298305
except KeyboardInterrupt:
299306
log(" ... was fetching %s" % url)
300307
sys.exit(1)
301308
except:
302-
log("500 %.3fs %s FAIL (from: [ %s ])" % ((datetime.datetime.now() - timestamp).total_seconds(), url, (",\n\t".join(get_referrers(url)))))
309+
elapsed = datetime.datetime.now() - request_start
310+
tags = [ u"FAIL (from [ %s ])" % (",\n\t".join(get_referrers(url))) ]
311+
log("%2d:%02d:%02d %7d %6d %s %6.3fs %s %s" % (hrs,min,sec, len(visited), len(urls), 500, elapsed.total_seconds(), url, " ".join(tags)))
303312
log("=============")
304313
log(traceback.format_exc())
305314
log("=============")

0 commit comments

Comments
 (0)