summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2024-04-12 11:02:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-14 06:31:45 +0100
commit9a2d08995e552f395fdfe91f7c204b7e65459412 (patch)
tree65d54197a26aff26bdc332fe337a01287487a567
parentd57e17425e05e1a415536a48569af39531a533a8 (diff)
downloadpoky-9a2d08995e552f395fdfe91f7c204b7e65459412.tar.gz
bitbake: prserv: use self.logger instead of logger directly
In both the PRServerClient and PRClient objects. This aligns with what is done in hashserv/server.py and makes it possible to benefit from possible specializations of the logger in the corresponding super classes, instead of using always the global logger. (Bitbake rev: 5fc6d2b1a5db617e16c1eb9fbd25e821237611d8) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Cc: Joshua Watt <JPEWhacker@gmail.com> Cc: Tim Orling <ticotimo@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/prserv/serv.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py
index 49f5ae36db..ab9a0a66df 100644
--- a/bitbake/lib/prserv/serv.py
+++ b/bitbake/lib/prserv/serv.py
@@ -53,9 +53,9 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection):
53 value = self.server.table.getValue(version, pkgarch, checksum) 53 value = self.server.table.getValue(version, pkgarch, checksum)
54 response = {"value": value} 54 response = {"value": value}
55 except prserv.NotFoundError: 55 except prserv.NotFoundError:
56 logger.error("can not find value for (%s, %s)",version, checksum) 56 self.logger.error("can not find value for (%s, %s)",version, checksum)
57 except sqlite3.Error as exc: 57 except sqlite3.Error as exc:
58 logger.error(str(exc)) 58 self.logger.error(str(exc))
59 59
60 return response 60 return response
61 61
@@ -82,7 +82,7 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection):
82 try: 82 try:
83 (metainfo, datainfo) = self.server.table.export(version, pkgarch, checksum, colinfo) 83 (metainfo, datainfo) = self.server.table.export(version, pkgarch, checksum, colinfo)
84 except sqlite3.Error as exc: 84 except sqlite3.Error as exc:
85 logger.error(str(exc)) 85 self.logger.error(str(exc))
86 metainfo = datainfo = None 86 metainfo = datainfo = None
87 87
88 return {"metainfo": metainfo, "datainfo": datainfo} 88 return {"metainfo": metainfo, "datainfo": datainfo}
@@ -105,7 +105,7 @@ class PRServer(bb.asyncrpc.AsyncServer):
105 self.db = prserv.db.PRData(self.dbfile, read_only=self.read_only) 105 self.db = prserv.db.PRData(self.dbfile, read_only=self.read_only)
106 self.table = self.db["PRMAIN"] 106 self.table = self.db["PRMAIN"]
107 107
108 logger.info("Started PRServer with DBfile: %s, Address: %s, PID: %s" % 108 self.logger.info("Started PRServer with DBfile: %s, Address: %s, PID: %s" %
109 (self.dbfile, self.address, str(os.getpid()))) 109 (self.dbfile, self.address, str(os.getpid())))
110 110
111 return tasks 111 return tasks