From 0234e3ac93fbfe1e74f1888599318084a749202d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 23 Mar 2016 11:07:08 +0100 Subject: Revert "autobuild: Return the last 50 log lines" This reverts commit aab2f39bb7ff330fbb01da4021c096e69a429d2e. This breaks if log_base is an https url... Traceback (most recent call last): File "script/autobuild.py", line 744, in elapsed_time, log_base=options.log_base) File "script/autobuild.py", line 608, in email_failure f = open("%s/%s.stdout" % (log_base, failed_tag), 'r') IOError: [Errno 2] No such file or directory: 'https://git.samba.org/uri/samba-autobuild/ctdb.stdout' Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Wed Mar 23 18:59:17 CET 2016 on sn-devel-144 --- script/autobuild.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'script') diff --git a/script/autobuild.py b/script/autobuild.py index 13be1b6a856..4cad9203339 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -566,7 +566,7 @@ def send_email(subject, text, log_tar): s.quit() def email_failure(status, failed_task, failed_stage, failed_tag, errstr, - elapsed_time, log_base=None, add_log_tail=True): + elapsed_time, log_base=None): '''send an email to options.email about the failure''' elapsed_minutes = elapsed_time / 60.0 user = os.getenv("USER") @@ -604,17 +604,6 @@ The top commit for the tree that was built was: ''' % (log_base, failed_tag, log_base, failed_tag, log_base, top_commit_msg) - if add_log_tail: - f = open("%s/%s.stdout" % (log_base, failed_tag), 'r') - log_tail = "".join(f.readlines()[-50:]) - - text += ''' -The last 50 lines of log messages: - -%s - ''' % log_tail - f.close() - logs = os.path.join(gitroot, 'logs.tar.gz') send_email('autobuild failure on %s for task %s during %s' % (platform.node(), failed_task, failed_stage), -- cgit v1.2.1