|
@@ -16,6 +16,7 @@ from bb import runqueue
|
|
|
import hashserv
|
|
|
|
|
|
logger = logging.getLogger('BitBake.SigGen')
|
|
|
+hashequiv_logger = logging.getLogger('BitBake.SigGen.HashEquiv')
|
|
|
|
|
|
def init(d):
|
|
|
siggens = [obj for obj in globals().values()
|
|
@@ -502,9 +503,9 @@ class SignatureGeneratorUniHashMixIn(object):
|
|
|
# A unique hash equal to the taskhash is not very interesting,
|
|
|
# so it is reported it at debug level 2. If they differ, that
|
|
|
# is much more interesting, so it is reported at debug level 1
|
|
|
- bb.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server))
|
|
|
+ hashequiv_logger.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server))
|
|
|
else:
|
|
|
- bb.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server))
|
|
|
+ hashequiv_logger.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server))
|
|
|
except hashserv.client.HashConnectionError as e:
|
|
|
bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))
|
|
|
|
|
@@ -578,12 +579,12 @@ class SignatureGeneratorUniHashMixIn(object):
|
|
|
new_unihash = data['unihash']
|
|
|
|
|
|
if new_unihash != unihash:
|
|
|
- bb.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server))
|
|
|
+ hashequiv_logger.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server))
|
|
|
bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d)
|
|
|
self.set_unihash(tid, new_unihash)
|
|
|
d.setVar('BB_UNIHASH', new_unihash)
|
|
|
else:
|
|
|
- bb.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server))
|
|
|
+ hashequiv_logger.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server))
|
|
|
except hashserv.client.HashConnectionError as e:
|
|
|
bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))
|
|
|
finally:
|
|
@@ -606,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object):
|
|
|
method = method + self.extramethod[tid]
|
|
|
|
|
|
data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data)
|
|
|
- bb.note('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data)))
|
|
|
+ hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data)))
|
|
|
|
|
|
if data is None:
|
|
|
bb.warn("Server unable to handle unihash report")
|
|
@@ -615,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object):
|
|
|
finalunihash = data['unihash']
|
|
|
|
|
|
if finalunihash == current_unihash:
|
|
|
- bb.note('Task %s unihash %s unchanged by server' % (tid, finalunihash))
|
|
|
+ hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash))
|
|
|
elif finalunihash == wanted_unihash:
|
|
|
- bb.note('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash))
|
|
|
+ hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash))
|
|
|
self.set_unihash(tid, finalunihash)
|
|
|
return True
|
|
|
else:
|
|
|
# TODO: What to do here?
|
|
|
- bb.note('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash))
|
|
|
+ hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash))
|
|
|
|
|
|
except hashserv.client.HashConnectionError as e:
|
|
|
bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))
|