diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2023-11-10 08:50:09 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-14 23:39:53 +0000 |
commit | f5a4dc0c17693bd70cd3571efe39df27a4bd33f9 (patch) | |
tree | 88a7eeabb23e29c1955c0521f7a0f7210a134397 | |
parent | ca74df3a6900f7836fe617a0baec65c4efe003aa (diff) | |
download | poky-f5a4dc0c17693bd70cd3571efe39df27a4bd33f9.tar.gz |
bitbake: asyncrpc: Add option to set log level when running as a process
When running an asyncrpc server as a subprocess, it is often desired to
run it with a lower logging level since the normal logging of clients
connecting and disconnecting is not desired.
As such, add an option to set the logging level of the server when
running as a subprocess and set the level to WARNING when starting a
local hashserver or PRserver
(Bitbake rev: 61dac7b99ad6d2a858f85d8ed1b5524d558be6c8)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/asyncrpc/serv.py | 5 | ||||
-rw-r--r-- | bitbake/lib/bb/cooker.py | 2 | ||||
-rw-r--r-- | bitbake/lib/prserv/serv.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/bitbake/lib/bb/asyncrpc/serv.py b/bitbake/lib/bb/asyncrpc/serv.py index 5fed1730df..f0be9a6cdb 100644 --- a/bitbake/lib/bb/asyncrpc/serv.py +++ b/bitbake/lib/bb/asyncrpc/serv.py | |||
@@ -322,7 +322,7 @@ class AsyncServer(object): | |||
322 | self.loop = asyncio.new_event_loop() | 322 | self.loop = asyncio.new_event_loop() |
323 | asyncio.set_event_loop(self.loop) | 323 | asyncio.set_event_loop(self.loop) |
324 | 324 | ||
325 | def serve_as_process(self, *, prefunc=None, args=()): | 325 | def serve_as_process(self, *, prefunc=None, args=(), log_level=None): |
326 | """ | 326 | """ |
327 | Serve requests in a child process | 327 | Serve requests in a child process |
328 | """ | 328 | """ |
@@ -351,6 +351,9 @@ class AsyncServer(object): | |||
351 | if prefunc is not None: | 351 | if prefunc is not None: |
352 | prefunc(self, *args) | 352 | prefunc(self, *args) |
353 | 353 | ||
354 | if log_level is not None: | ||
355 | self.logger.setLevel(log_level) | ||
356 | |||
354 | self._serve_forever(tasks) | 357 | self._serve_forever(tasks) |
355 | 358 | ||
356 | if sys.version_info >= (3, 6): | 359 | if sys.version_info >= (3, 6): |
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 9a3e32ac1b..4bf1809bc0 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -345,7 +345,7 @@ class BBCooker: | |||
345 | sync=False, | 345 | sync=False, |
346 | upstream=upstream, | 346 | upstream=upstream, |
347 | ) | 347 | ) |
348 | self.hashserv.serve_as_process() | 348 | self.hashserv.serve_as_process(log_level=logging.WARNING) |
349 | for mc in self.databuilder.mcdata: | 349 | for mc in self.databuilder.mcdata: |
350 | self.databuilder.mcorigdata[mc].setVar("BB_HASHSERVE", self.hashservaddr) | 350 | self.databuilder.mcorigdata[mc].setVar("BB_HASHSERVE", self.hashservaddr) |
351 | self.databuilder.mcdata[mc].setVar("BB_HASHSERVE", self.hashservaddr) | 351 | self.databuilder.mcdata[mc].setVar("BB_HASHSERVE", self.hashservaddr) |
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index 6168eb183d..62d3b5a01c 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py | |||
@@ -130,7 +130,7 @@ class PRServSingleton(object): | |||
130 | def start(self): | 130 | def start(self): |
131 | self.prserv = PRServer(self.dbfile) | 131 | self.prserv = PRServer(self.dbfile) |
132 | self.prserv.start_tcp_server(socket.gethostbyname(self.host), self.port) | 132 | self.prserv.start_tcp_server(socket.gethostbyname(self.host), self.port) |
133 | self.process = self.prserv.serve_as_process() | 133 | self.process = self.prserv.serve_as_process(log_level=logging.WARNING) |
134 | 134 | ||
135 | if not self.prserv.address: | 135 | if not self.prserv.address: |
136 | raise PRServiceConfigError | 136 | raise PRServiceConfigError |