From a4fa8f1bd88995ae60e10430316fbed63d478587 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 24 Jul 2019 09:13:55 +0100 Subject: cooker/hashserv: Allow autostarting of a local hash server using BB_HASHSERVE Its useful, particularly in the local developer model of usage, for bitbake to start and stop a hash equivalence server on local port, rather than relying on one being started by the user before the build. The new BB_HASHSERVE variable supports this. The database handling is moved internally into the hashserv code so that different threads/processes can be used for the server without errors. Signed-off-by: Richard Purdie --- bin/bitbake-hashserv | 4 +--- bin/bitbake-worker | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/bitbake-hashserv b/bin/bitbake-hashserv index 848a0ca39..6c911c098 100755 --- a/bin/bitbake-hashserv +++ b/bin/bitbake-hashserv @@ -41,9 +41,7 @@ def main(): console.setLevel(level) logger.addHandler(console) - db = sqlite3.connect(args.database) - - server = hashserv.create_server((args.address, args.port), db, args.prefix) + server = hashserv.create_server((args.address, args.port), args.database, args.prefix) server.serve_forever() return 0 diff --git a/bin/bitbake-worker b/bin/bitbake-worker index 3e502d5ca..96369199f 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -418,6 +418,7 @@ class BitbakeWorker(object): bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] for mc in self.databuilder.mcdata: self.databuilder.mcdata[mc].setVar("PRSERV_HOST", self.workerdata["prhost"]) + self.databuilder.mcdata[mc].setVar("BB_HASHSERVE", self.workerdata["hashservport"]) def handle_newtaskhashes(self, data): self.workerdata["newhashes"] = pickle.loads(data) -- cgit 1.2.3-korg