Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

[vuplus_openembedded] / classes / oestats-client.bbclass

diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass
index 968aa42..8922496 100644 (file)
--- a/classes/oestats-client.bbclass
+++ b/classes/oestats-client.bbclass
@@ -18,8 +18,9 @@ def oestats_getid(d):
        f = file(bb.data.getVar('TMPDIR', d, True) + '/oestats.id', 'r')
        return f.read()
        
-def oestats_send(server, action, vars = {}, files = {}):
+def oestats_send(d, server, action, vars = {}, files = {}):
        import httplib
+       import bb
 
        # build body
        output = []
@@ -49,7 +50,16 @@ def oestats_send(server, action, vars = {}, files = {}):
                "Content-length": str(len(body))}
 
        # send request
-       conn = httplib.HTTPConnection(server)
+       proxy = bb.data.getVar('HTTP_PROXY', d, True )
+       if (proxy):
+               if (proxy.endswith('/')):
+                       proxy = proxy[:-1]
+               if (proxy.startswith('http://')):
+                       proxy = proxy[7:]
+               conn = httplib.HTTPConnection(proxy)
+               action = "http://%s%s" %(server, action)
+       else:
+               conn = httplib.HTTPConnection(server)
        conn.request("POST", action, body, headers)
        response = conn.getresponse()
        data = response.read()
@@ -64,7 +74,7 @@ def oestats_start(server, builder, d):
        # send report
        id = ""
        try:
-               data = oestats_send(server, "/builds/", {
+               data = oestats_send(d, server, "/builds/", {
                        'builder': builder,
                        'build_arch': bb.data.getVar('BUILD_ARCH', d, True),
                        'metadata_branch': bb.data.getVar('METADATA_BRANCH', d, True),
@@ -97,15 +107,18 @@ def oestats_stop(server, d, failures):
                status = "Succeeded"                  
 
        try:
-               response = oestats_send(server, "/builds/%s/" % id, {
+               response = oestats_send(d, server, "/builds/%s/" % id, {
                        'status': status,
                })
+               if status == 'Failed':
+                       bb.note("oestats: build failed, see http://%s%s" % (server,response))
        except:
                bb.note("oestats: error stopping build")
 
 def oestats_task(server, d, task, status):
        import bb
        import glob
+       import os.path
        import time
 
        # retrieve build id
@@ -124,11 +137,17 @@ def oestats_task(server, d, task, status):
                logs = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', d, True), task))
                if len(logs) > 0:
                        log = logs[0]
-                       bb.note("oestats: sending log file : %s" % log)
                        files['log'] = {
                                'filename': 'log.txt',
                                'content': file(log).read(),
                                'content-type': 'text/plain'}
+       if task == 'do_package':
+               qalog = "%s/log.qa_package" % bb.data.getVar('T', d, True)
+               if os.path.exists(qalog):
+                       files['qalog'] = {
+                               'filename': 'qalog.txt',
+                               'content': file(qalog).read(),
+                               'content-type': 'text/plain'}
        
        # prepare report
        vars = {
@@ -148,7 +167,9 @@ def oestats_task(server, d, task, status):
 
        # send report
        try:
-               response = oestats_send(server, "/tasks/", vars, files)
+               response = oestats_send(d, server, "/tasks/", vars, files)
+               if status == 'Failed':
+                       bb.note("oestats: task failed, see http://%s%s" % (server, response))
        except:
                bb.note("oestats: error sending task, disabling stats")
                oestats_setid(d, "")