diff --git a/daemon/core/gui/coreclient.py b/daemon/core/gui/coreclient.py index fa3b91a9..d2cc74b2 100644 --- a/daemon/core/gui/coreclient.py +++ b/daemon/core/gui/coreclient.py @@ -184,7 +184,7 @@ class CoreClient: else: dialog.set_pause() else: - logging.warning("Unknown session event: %s", session_event) + logging.warning("unknown session event: %s", session_event) elif event.HasField("node_event"): self.handle_node_event(event.node_event) elif event.HasField("config_event"): @@ -192,7 +192,7 @@ class CoreClient: elif event.HasField("exception_event"): self.handle_exception_event(event) else: - logging.info("Unhandled event: %s", event) + logging.info("unhandled event: %s", event) def handle_link_event(self, event: core_pb2.LinkEvent): logging.debug("Link event: %s", event) @@ -209,7 +209,7 @@ class CoreClient: logging.warning("unknown link event: %s", event.message_type) def handle_node_event(self, event: core_pb2.NodeEvent): - logging.debug("Node event: %s", event) + logging.debug("node event: %s", event) if event.source == GUI_SOURCE: return node_id = event.node.id @@ -239,11 +239,11 @@ class CoreClient: self.app.canvas.set_throughputs(event) def handle_exception_event(self, event: core_pb2.ExceptionEvent): - logging.info("Exception event: %s", event) + logging.info("exception event: %s", event) self.app.statusbar.core_alarms.append(event) def join_session(self, session_id: int, query_location: bool = True): - logging.info("Join session(%s)", session_id) + logging.info("join session(%s)", session_id) # update session and title self.session_id = session_id self.master.title(f"CORE Session({self.session_id})") @@ -427,7 +427,7 @@ class CoreClient: session_id = self.session_id try: response = self.client.delete_session(session_id) - logging.info("delete session(%s), Result: %s", session_id, response) + logging.info("deleted session(%s), Result: %s", session_id, response) except grpc.RpcError as e: self.app.after(0, show_grpc_error, e) @@ -437,7 +437,6 @@ class CoreClient: """ try: self.client.connect() - logging.debug("Client connect to daemon") # get service information response = self.client.get_services() for service in response.services: @@ -513,7 +512,7 @@ class CoreClient: config_service_configs, ) logging.info( - "Start session(%s), Result: %s", self.session_id, response.result + "start session(%s), result: %s", self.session_id, response.result ) if response.result: @@ -528,7 +527,7 @@ class CoreClient: response = core_pb2.StopSessionResponse(result=False) try: response = self.client.stop_session(session_id) - logging.info("Stop session(%s), Result: %s", session_id, response) + logging.info("stopped session(%s), result: %s", session_id, response) except grpc.RpcError as e: self.app.after(0, show_grpc_error, e) return response @@ -562,7 +561,7 @@ class CoreClient: metadata = {"canvas": canvas_config, "shapes": shapes} response = self.client.set_session_metadata(self.session_id, metadata) - logging.info("Set session metadata %s, Result: %s", metadata, response) + logging.info("set session metadata %s, result: %s", metadata, response) def launch_terminal(self, node_id: int): try: @@ -572,7 +571,7 @@ class CoreClient: if output in DEFAULT_TERMS: terminal = DEFAULT_TERMS[output] cmd = f'{terminal} "{response.terminal}" &' - logging.info("Launch terminal %s", cmd) + logging.info("launching terminal %s", cmd) os.system(cmd) except grpc.RpcError as e: self.app.after(0, show_grpc_error, e) @@ -586,7 +585,7 @@ class CoreClient: logging.debug("Send session data to the daemon") self.send_data() response = self.client.save_xml(self.session_id, file_path) - logging.info("Save XML file %s, Result: %s", file_path, response) + logging.info("saved xml file %s, result: %s", file_path, response) except grpc.RpcError as e: self.app.after(0, show_grpc_error, e) @@ -596,7 +595,7 @@ class CoreClient: """ try: response = self.client.open_xml(file_path) - logging.info("Open XML file %s, Response: %s", file_path, response) + logging.info("open xml file %s, response: %s", file_path, response) self.join_session(response.session_id) except grpc.RpcError as e: self.app.after(0, show_grpc_error, e) @@ -606,7 +605,7 @@ class CoreClient: ) -> core_pb2.NodeServiceData: response = self.client.get_node_service(self.session_id, node_id, service_name) logging.debug( - "Get node(%s) %s service, Response: %s", node_id, service_name, response + "get node(%s) %s service, response: %s", node_id, service_name, response ) return response.service @@ -640,7 +639,7 @@ class CoreClient: self.session_id, node_id, service_name, file_name ) logging.debug( - "Get service file for node(%s), Service: %s, File: %s, Result: %s", + "get service file for node(%s), service: %s, file: %s, result: %s", node_id, service_name, file_name, @@ -655,7 +654,7 @@ class CoreClient: self.session_id, node_id, service_name, file_name, data ) logging.info( - "Set node(%s) service file, Service: %s, File: %s, Data: %s, Result: %s", + "set node(%s) service file, service: %s, file: %s, data: %s, result: %s", node_id, service_name, file_name, @@ -677,7 +676,7 @@ class CoreClient: self.client.set_session_state(self.session_id, core_pb2.SessionState.DEFINITION) for node_proto in node_protos: response = self.client.add_node(self.session_id, node_proto) - logging.debug("Create node: %s", response) + logging.debug("create node: %s", response) for link_proto in link_protos: response = self.client.add_link( self.session_id, @@ -687,7 +686,7 @@ class CoreClient: link_proto.interface_two, link_proto.options, ) - logging.debug("Create link: %s", response) + logging.debug("create link: %s", response) def send_data(self): """ @@ -787,7 +786,7 @@ class CoreClient: services = NodeUtils.get_custom_node_services(self.app.guiconfig, model) node.services[:] = services logging.info( - "Add node(%s) to session(%s), coordinates(%s, %s)", + "add node(%s) to session(%s), coordinates(%s, %s)", node.name, self.session_id, x, @@ -963,7 +962,7 @@ class CoreClient: response = self.client.get_wlan_config(self.session_id, node_id) config = response.config logging.debug( - "Get wlan configuration from node %s, Result configuration: %s", + "get wlan configuration from node %s, result configuration: %s", node_id, config, ) @@ -975,7 +974,7 @@ class CoreClient: response = self.client.get_mobility_config(self.session_id, node_id) config = response.config logging.debug( - "Get mobility config from node %s, Result configuration: %s", + "get mobility config from node %s, result configuration: %s", node_id, config, ) @@ -993,7 +992,7 @@ class CoreClient: ) config = response.config logging.debug( - "Get emane model config: Node id: %s, EMANE model: %s, Interface: %s, Config: %s", + "get emane model config: node id: %s, EMANE model: %s, interface: %s, config: %s", node_id, model, interface, @@ -1009,7 +1008,7 @@ class CoreClient: interface: int = None, ): logging.info( - "Set emane model config: Node id: %s, EMANE Model: %s, Interface: %s, Config: %s", + "set emane model config: node id: %s, EMANE Model: %s, interface: %s, config: %s", node_id, model, interface, @@ -1020,7 +1019,7 @@ class CoreClient: def copy_node_service(self, _from: int, _to: int): services = self.canvas_nodes[_from].core_node.services self.canvas_nodes[_to].core_node.services[:] = services - logging.debug("Copy node %s service to node %s", _from, _to) + logging.debug("copying node %s service to node %s", _from, _to) def copy_node_config(self, _from: int, _to: int): node_type = self.canvas_nodes[_from].core_node.type diff --git a/daemon/core/gui/dialogs/customnodes.py b/daemon/core/gui/dialogs/customnodes.py index 8f3983a6..2cad2fef 100644 --- a/daemon/core/gui/dialogs/customnodes.py +++ b/daemon/core/gui/dialogs/customnodes.py @@ -219,7 +219,7 @@ class CustomNodesDialog(Dialog): image_file = Path(self.image_file).stem node_draw = NodeDraw.from_custom(name, image_file, set(self.services)) logging.info( - "Created new custom node (%s), image file (%s), services: (%s)", + "created new custom node (%s), image file (%s), services: (%s)", name, image_file, self.services, @@ -239,7 +239,7 @@ class CustomNodesDialog(Dialog): node_draw.image = self.image node_draw.services = self.services logging.debug( - "Edit custom node (%s), image: (%s), services (%s)", + "edit custom node (%s), image: (%s), services (%s)", name, self.image_file, self.services, diff --git a/daemon/core/gui/graph/graph.py b/daemon/core/gui/graph/graph.py index 663c556d..b40e8b59 100644 --- a/daemon/core/gui/graph/graph.py +++ b/daemon/core/gui/graph/graph.py @@ -216,7 +216,7 @@ class CanvasGraph(tk.Canvas): """ # draw existing nodes for core_node in session.nodes: - logging.debug("Draw node %s", core_node) + logging.debug("drawing node %s", core_node) # peer to peer node is not drawn on the GUI if NodeUtils.is_ignore_node(core_node.type): continue @@ -232,7 +232,7 @@ class CanvasGraph(tk.Canvas): # draw existing links for link in session.links: - logging.debug("Draw link: %s", link) + logging.debug("drawing link: %s", link) canvas_node_one = self.core.canvas_nodes[link.node_one_id] node_one = canvas_node_one.core_node canvas_node_two = self.core.canvas_nodes[link.node_two_id] @@ -795,14 +795,14 @@ class CanvasGraph(tk.Canvas): self.tag_raise(component) def update_grid(self): - logging.debug("Show grid: %s", self.show_grid.get()) + logging.debug("updating grid show grid: %s", self.show_grid.get()) if self.show_grid.get(): self.itemconfig(tags.GRIDLINE, state=tk.NORMAL) else: self.itemconfig(tags.GRIDLINE, state=tk.HIDDEN) def set_wallpaper(self, filename: str): - logging.debug("Set wallpaper: %s", filename) + logging.debug("setting wallpaper: %s", filename) if filename: img = Image.open(filename) self.wallpaper = img @@ -834,7 +834,7 @@ class CanvasGraph(tk.Canvas): def copy(self): if self.selection: - logging.debug("Copy %s nodes", len(self.selection)) + logging.debug("to copy %s nodes", len(self.selection)) self.to_copy = self.selection.keys() def paste(self): diff --git a/daemon/core/gui/menuaction.py b/daemon/core/gui/menuaction.py index 6f7e5371..245eea70 100644 --- a/daemon/core/gui/menuaction.py +++ b/daemon/core/gui/menuaction.py @@ -110,11 +110,9 @@ class MenuAction: dialog.show() def help_core_github(self): - logging.debug("Core github") webbrowser.open_new("https://github.com/coreemu/core") def help_core_documentation(self): - logging.debug("Core documentation") webbrowser.open_new("http://coreemu.github.io/core/") def session_options(self): @@ -142,12 +140,10 @@ class MenuAction: dialog.show() def show_about(self): - logging.debug("Click about") dialog = AboutDialog(self.app, self.app) dialog.show() def throughput(self): - logging.debug("Click throughput") if not self.app.core.handling_throughputs: self.app.core.enable_throughputs() else: diff --git a/daemon/core/gui/statusbar.py b/daemon/core/gui/statusbar.py index 2accbf54..6de511c4 100644 --- a/daemon/core/gui/statusbar.py +++ b/daemon/core/gui/statusbar.py @@ -1,7 +1,6 @@ """ status bar """ -import logging import tkinter as tk from tkinter import ttk from typing import TYPE_CHECKING @@ -72,7 +71,6 @@ class StatusBar(ttk.Frame): self.alerts_button.grid(row=0, column=4, sticky="ew") def click_alerts(self): - logging.debug("Click alerts") dialog = AlertsDialog(self.app, self.app) dialog.show()