diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-24 09:13:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-06 11:21:07 +0100 |
commit | a4fa8f1bd88995ae60e10430316fbed63d478587 (patch) | |
tree | 1e600d955490012da58985d0bdf06c5371781db7 /lib/hashserv | |
parent | 6a901bb904a97ca90d88be2c6901d3d32346282f (diff) | |
download | bitbake-a4fa8f1bd88995ae60e10430316fbed63d478587.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/hashserv')
-rw-r--r-- | lib/hashserv/__init__.py | 19 | ||||
-rw-r--r-- | lib/hashserv/tests.py | 7 |
2 files changed, 20 insertions, 6 deletions
diff --git a/lib/hashserv/__init__.py b/lib/hashserv/__init__.py index 768c5504c..7ec9b6441 100644 --- a/lib/hashserv/__init__.py +++ b/lib/hashserv/__init__.py @@ -18,8 +18,15 @@ class HashEquivalenceServer(BaseHTTPRequestHandler): def log_message(self, f, *args): logger.debug(f, *args) + def opendb(self): + self.db = sqlite3.connect(self.dbname) + self.db.row_factory = sqlite3.Row + def do_GET(self): try: + if not self.db: + self.opendb() + p = urllib.parse.urlparse(self.path) if p.path != self.prefix + '/v1/equivalent': @@ -52,6 +59,9 @@ class HashEquivalenceServer(BaseHTTPRequestHandler): def do_POST(self): try: + if not self.db: + self.opendb() + p = urllib.parse.urlparse(self.path) if p.path != self.prefix + '/v1/equivalent': @@ -123,14 +133,17 @@ class HashEquivalenceServer(BaseHTTPRequestHandler): self.send_error(400, explain=traceback.format_exc()) return -def create_server(addr, db, prefix=''): +def create_server(addr, dbname, prefix=''): class Handler(HashEquivalenceServer): pass - Handler.prefix = prefix - Handler.db = db + db = sqlite3.connect(dbname) db.row_factory = sqlite3.Row + Handler.prefix = prefix + Handler.db = None + Handler.dbname = dbname + with contextlib.closing(db.cursor()) as cursor: cursor.execute(''' CREATE TABLE IF NOT EXISTS tasks_v2 ( diff --git a/lib/hashserv/tests.py b/lib/hashserv/tests.py index 8300a2559..15f4a52ee 100644 --- a/lib/hashserv/tests.py +++ b/lib/hashserv/tests.py @@ -11,14 +11,15 @@ import sqlite3 import hashlib import urllib.request import json +import tempfile from . import create_server class TestHashEquivalenceServer(unittest.TestCase): def setUp(self): - # Start an in memory hash equivalence server in the background bound to + # Start a hash equivalence server in the background bound to # an ephemeral port - db = sqlite3.connect(':memory:', check_same_thread=False) - self.server = create_server(('localhost', 0), db) + self.dbfile = tempfile.NamedTemporaryFile(prefix="bb-hashserv-db-") + self.server = create_server(('localhost', 0), self.dbfile.name) self.server_addr = 'http://localhost:%d' % self.server.socket.getsockname()[1] self.server_thread = threading.Thread(target=self.server.serve_forever) self.server_thread.start() |