From aba31048cc5d3784f7cef8a15fc64c43502e7f9e Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sat, 12 Mar 2022 15:01:51 +0000 Subject: [PATCH] Put BAPSicle in process names for htop filtering. --- controllers/mattchbox_usb.py | 2 +- file_manager.py | 2 +- helpers/state_manager.py | 2 +- launch.py | 2 +- player.py | 2 +- player_handler.py | 2 +- server.py | 2 +- web_server.py | 2 +- websocket_server.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/controllers/mattchbox_usb.py b/controllers/mattchbox_usb.py index 12552d1..6e90d82 100644 --- a/controllers/mattchbox_usb.py +++ b/controllers/mattchbox_usb.py @@ -21,7 +21,7 @@ class MattchBox(Controller): self, player_to_q: List[Queue], player_from_q: Queue, state: StateManager ): - process_title = "ControllerHandler" + process_title = "BAPSicle - ControllerHandler" setproctitle(process_title) current_process().name = process_title diff --git a/file_manager.py b/file_manager.py index d8368a4..f49102e 100644 --- a/file_manager.py +++ b/file_manager.py @@ -23,7 +23,7 @@ class FileManager: self.logger = LoggingManager("FileManager") self.api = MyRadioAPI(self.logger, server_config) - process_title = "File Manager" + process_title = "BAPSicle - File Manager" setproctitle(process_title) current_process().name = process_title diff --git a/helpers/state_manager.py b/helpers/state_manager.py index 6cf6140..a7932c5 100644 --- a/helpers/state_manager.py +++ b/helpers/state_manager.py @@ -31,7 +31,7 @@ class StateManager: rate_limit_period_s=5, ): # When a StateManager is shared via proxy to other processes, it has a thread itself. - process_title = "StateManager Proxy" + process_title = "BAPSicle - StateManager Proxy" setproctitle(process_title) current_process().name = process_title diff --git a/launch.py b/launch.py index 61ce58e..301d4b1 100755 --- a/launch.py +++ b/launch.py @@ -58,7 +58,7 @@ if __name__ == "__main__": # If it's not here, multiprocessing just doesn't run in the package. # Freeze support refers to being packaged with Pyinstaller. multiprocessing.freeze_support() - setproctitle("BAPSicle Launcher") + setproctitle("BAPSicle - Launcher") if len(sys.argv) > 1: # We got an argument! It's probably Platypus's UI. try: diff --git a/player.py b/player.py index c594a55..396fd55 100644 --- a/player.py +++ b/player.py @@ -1092,7 +1092,7 @@ class Player: server_state: StateManager, ): - process_title = "Player: Channel " + str(channel) + process_title = "BAPSicle - Player: Channel " + str(channel) setproctitle.setproctitle(process_title) multiprocessing.current_process().name = process_title diff --git a/player_handler.py b/player_handler.py index 46658cb..b66d0d7 100644 --- a/player_handler.py +++ b/player_handler.py @@ -15,7 +15,7 @@ class PlayerHandler: ): self.logger = LoggingManager("PlayerHandler") - process_title = "Player Handler" + process_title = "BAPSicle - Player Handler" setproctitle(process_title) current_process().name = process_title diff --git a/server.py b/server.py index 3f59096..7a02f6f 100644 --- a/server.py +++ b/server.py @@ -208,7 +208,7 @@ class BAPSicleServer: if isMacOS() or isLinux(): multiprocessing.set_start_method("spawn", True) - process_title = "startServer" + process_title = "BAPSicle - startServer" setproctitle(process_title) multiprocessing.current_process().name = process_title diff --git a/web_server.py b/web_server.py index ab90de1..a14627e 100644 --- a/web_server.py +++ b/web_server.py @@ -544,7 +544,7 @@ def WebServer(player_to: List[Queue], player_from: Queue, state: StateManager): api = MyRadioAPI(logger, state) alerts = AlertManager() - process_title = "Web Server" + process_title = "BAPSicle - Web Server" setproctitle(process_title) current_process().name = process_title CORS(app, supports_credentials=True) # Allow ALL CORS!!! diff --git a/websocket_server.py b/websocket_server.py index d58f777..f21107e 100644 --- a/websocket_server.py +++ b/websocket_server.py @@ -33,7 +33,7 @@ class WebsocketServer: self.player_to_q = in_q self.player_from_q = out_q - process_title = "Websockets Server" + process_title = "BAPSicle - Websockets Server" setproctitle(process_title) current_process().name = process_title