Skip to content

Commit 7c67e26

Browse files
committed
Added a --logfile switch to the test crawler, in order to be able to control whether a logfile should be used or not. It's not particularly hepful when running on a buildbot slave, which catches stdout anyway.
- Legacy-Id: 9252
1 parent f8ce949 commit 7c67e26

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

bin/test-crawl

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ parser.add_argument('--urls', '-u', dest='url_file',
1414
parser.add_argument('--slow', dest='slow_threshold', type=float, default=1.0,
1515
help='responses taking longer than this (in seconds) results in SLOW being printed')
1616
parser.add_argument('--settings', dest='settings', help='custom settings file')
17+
parser.add_argument('--logfile', dest='logfile', help='write to logfile')
1718

1819
args = parser.parse_args()
1920

@@ -111,14 +112,16 @@ errors = 0
111112
count = 0
112113

113114
start_time = datetime.datetime.now()
114-
fh, fn = tempfile.mkstemp(prefix="test-crawl-", suffix=".log", dir="../")
115-
logfile = open(fn, "w")
116-
os.close(fh)
115+
116+
logfile = None
117+
if args.logfile:
118+
logfile = open(args.logfile, "w")
117119

118120
def log(s):
119121
print(s)
120-
logfile.write(s)
121-
logfile.write('\n')
122+
if logfile:
123+
logfile.write(s)
124+
logfile.write('\n')
122125

123126
def get_referrers(url):
124127
ref_list = []
@@ -202,8 +205,9 @@ while urls:
202205

203206
log("%2d:%02d:%02d %7d %6d %s %6.3fs %s %s" % (hrs,min,sec, len(visited), len(urls), r.status_code, elapsed.total_seconds(), url, " ".join(tags)))
204207

205-
logfile.close()
206-
sys.stderr.write("Output written to %s\n\n" % logfile.name)
208+
if logfile:
209+
logfile.close()
210+
sys.stderr.write("Output written to %s\n\n" % logfile.name)
207211

208212
if errors > 0:
209213
sys.stderr.write("Found %s errors, grep output for FAIL for details\n" % errors)

0 commit comments

Comments
 (0)