diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/tinderclient.bbclass | 74 |
1 files changed, 47 insertions, 27 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 869cd043ba..0c0c470bb8 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,24 +1,50 @@ -def base_tinder_time(): +def tinder_tinder_time(): import time return time.strftime('%m/%d/%Y %H:%M:%S', time.localtime()) +def tinder_send_email(da, header, log): + import smtplib + from bb import data + from email.MIMEText import MIMEText + msg = MIMEText(header +'\n' + log) + msg['Subject'] = data.getVar('TINDER_SUBJECT',da, True) or "Tinder-Client build log" + msg['To'] = data.getVar('TINDER_MAILTO' ,da, True) + msg['From'] = data.getVar('TINDER_FROM', da, True) + + + s = smtplib.SMTP() + s.connect() + s.sendmail(data.getVar('TINDER_FROM', da, True), [data.getVar('TINDER_MAILTO', da, True)], msg.as_string()) + s.close() + +def tinder_send_http(da, header, log): + from bb import data + import httplib, urllib + cont = "\n%s\n%s" % ( header, log) + headers = {"Content-type": "multipart/form-data" } + + conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True)) + conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers) + conn.close() + + # Prepare tinderbox mail header -def base_prepare_mail_header(data, status): - import bb +def tinder_prepare_mail_header(da, status): + from bb import data - str = "tinderbox: administrator: %s\n" % bb.data.getVar('TINDER_ADMIN', data, True) - str += "tinderbox: starttime: %s\n" % bb.data.getVar('TINDER_START', data, True) - str += "tinderbox: buildname: %s\n" % bb.data.getVar('TINDER_BUILD', data, True) - str += "tinderbox: errorparser: %s\n" % bb.data.getVar('TINDER_ERROR', data, True) + str = "tinderbox: administrator: %s\n" % data.getVar('TINDER_ADMIN', da, True) + str += "tinderbox: starttime: %s\n" % data.getVar('BUILDSTART', da, True) or data.getVar('TINDER_START', da, True) + str += "tinderbox: buildname: %s\n" % data.getVar('TINDER_BUILD', da, True) + str += "tinderbox: errorparser: %s\n" % data.getVar('TINDER_ERROR', da, True) str += "tinderbox: status: %s\n" % status - str += "tinderbox: timenow: %s\n" % base_tinder_time() - str += "tinderbox: tree: %s\n" % bb.data.getVar('TINDER_TREE', data, True) + str += "tinderbox: timenow: %s\n" % tinder_tinder_time() + str += "tinderbox: tree: %s\n" % data.getVar('TINDER_TREE', da, True) str += "tinderbox: buildfamily: %s\n" % "unix" str += "tinderbox: END" return str -def base_do_tinder_report(event): +def tinder_do_tinder_report(event): """ Report to the tinderbox. Either we will report every step (depending on TINDER_VERBOSE_REPORT) at the end we will send the @@ -36,7 +62,7 @@ def base_do_tinder_report(event): # Check what we need to do Build* shows we start or are done if name == "BuildStarted": - header = base_prepare_mail_header(event.data, 'building') + header = tinder_prepare_mail_header(event.data, 'building') # generate for var in os.environ: log += "%s=%s\n" % (var, os.environ[var]) @@ -52,7 +78,7 @@ def base_do_tinder_report(event): status = 'build_failed' if name == "BuildCompleted": status = "success" - header = base_prepare_mail_header(event.data, status) + header = tinder_prepare_mail_header(event.data, status) # append the log log_file = data.getVar('TINDER_LOG', event.data, True) file = open(log_file, 'r') @@ -60,15 +86,15 @@ def base_do_tinder_report(event): log += line if verbose and name == "TaskStarted": - header = base_prepare_mail_header(event.data, 'building') + header = tinder_prepare_mail_header(event.data, 'building') log = "Task %s started" % event.task if verbose and name == "PkgStarted": - header = base_prepare_mail_header(event.data, 'building') + header = tinder_prepare_mail_header(event.data, 'building') log = "Package %s started" % data.getVar('P', event.data, True) if verbose and name == "PkgSucceeded": - header = base_prepare_mail_header(event.data, 'building') + header = tinder_prepare_mail_header(event.data, 'building') log = "Package %s done" % data.getVar('P', event.data, True) # Append the Task Log @@ -84,7 +110,7 @@ def base_do_tinder_report(event): # append to the log if verbose: - header = base_prepare_mail_header(event.data, 'building') + header = tinder_prepare_mail_header(event.data, 'building') for line in log_txt: log += line @@ -92,18 +118,12 @@ def base_do_tinder_report(event): if len(log) == 0 or len(header) == 0: return - import smtplib - from email.MIMEText import MIMEText - msg = MIMEText(header +'\n' + log) - msg['Subject'] = data.getVar('TINDER_SUBJECT',event.data, True) or "Tinder-Client build log" - msg['To'] = data.getVar('TINDER_MAILTO',event.data, True) - msg['From'] = data.getVar('TINDER_FROM', event.data, True) + log_post_method = tinder_send_email + if data.getVar('TINDER_SENDLOG', event.data, True) == "http": + log_post_method = tinder_send_http + log_post_method(event.data, header, log) - s = smtplib.SMTP() - s.connect() - s.sendmail(data.getVar('TINDER_FROM', event.data, True), [data.getVar('TINDER_MAILTO', event.data, True)], msg.as_string()) - s.close() addhandler tinderclient_eventhandler python tinderclient_eventhandler() { @@ -112,7 +132,7 @@ python tinderclient_eventhandler() { do_tinder_report = data.getVar('TINDER_REPORT', e.data, True) if do_tinder_report and do_tinder_report == "1": - base_do_tinder_report(e) + tinder_do_tinder_report(e) return NotHandled } |