afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove unnecessary loggings

Browse source
This commit is contained in:
Huy Pham 2020-02-03 12:18:29 -08:00
parent b7206fe7b9
commit 6140ebfb59
5 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
daemon/core/gui/coreclient.py
View file

@ -184,7 +184,7 @@ class CoreClient:
else: else:
dialog.set_pause() dialog.set_pause()
else: else:
logging.warning("Unknown session event: %s", session_event) logging.warning("unknown session event: %s", session_event)
elif event.HasField("node_event"): elif event.HasField("node_event"):
self.handle_node_event(event.node_event) self.handle_node_event(event.node_event)
elif event.HasField("config_event"): elif event.HasField("config_event"):
@ -192,7 +192,7 @@ class CoreClient:
elif event.HasField("exception_event"): elif event.HasField("exception_event"):
self.handle_exception_event(event) self.handle_exception_event(event)
else: else:
logging.info("Unhandled event: %s", event) logging.info("unhandled event: %s", event)
def handle_link_event(self, event: core_pb2.LinkEvent): def handle_link_event(self, event: core_pb2.LinkEvent):
logging.debug("Link event: %s", event) logging.debug("Link event: %s", event)
@ -209,7 +209,7 @@ class CoreClient:
logging.warning("unknown link event: %s", event.message_type) logging.warning("unknown link event: %s", event.message_type)
def handle_node_event(self, event: core_pb2.NodeEvent): 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: if event.source == GUI_SOURCE:
return return
node_id = event.node.id node_id = event.node.id
@ -239,11 +239,11 @@ class CoreClient:
self.app.canvas.set_throughputs(event) self.app.canvas.set_throughputs(event)
def handle_exception_event(self, event: core_pb2.ExceptionEvent): 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) self.app.statusbar.core_alarms.append(event)
def join_session(self, session_id: int, query_location: bool = True): 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 # update session and title
self.session_id = session_id self.session_id = session_id
self.master.title(f"CORE Session({self.session_id})") self.master.title(f"CORE Session({self.session_id})")
@ -427,7 +427,7 @@ class CoreClient:
session_id = self.session_id session_id = self.session_id
try: try:
response = self.client.delete_session(session_id) 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: except grpc.RpcError as e:
self.app.after(0, show_grpc_error, e) self.app.after(0, show_grpc_error, e)
@ -437,7 +437,6 @@ class CoreClient:
""" """
try: try:
self.client.connect() self.client.connect()
logging.debug("Client connect to daemon")
# get service information # get service information
response = self.client.get_services() response = self.client.get_services()
for service in response.services: for service in response.services:
@ -513,7 +512,7 @@ class CoreClient:
config_service_configs, config_service_configs,
) )
logging.info( 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: if response.result:
@ -528,7 +527,7 @@ class CoreClient:
response = core_pb2.StopSessionResponse(result=False) response = core_pb2.StopSessionResponse(result=False)
try: try:
response = self.client.stop_session(session_id) 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: except grpc.RpcError as e:
self.app.after(0, show_grpc_error, e) self.app.after(0, show_grpc_error, e)
return response return response
@ -562,7 +561,7 @@ class CoreClient:
metadata = {"canvas": canvas_config, "shapes": shapes} metadata = {"canvas": canvas_config, "shapes": shapes}
response = self.client.set_session_metadata(self.session_id, metadata) 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): def launch_terminal(self, node_id: int):
try: try:
@ -572,7 +571,7 @@ class CoreClient:
if output in DEFAULT_TERMS: if output in DEFAULT_TERMS:
terminal = DEFAULT_TERMS[output] terminal = DEFAULT_TERMS[output]
cmd = f'{terminal} "{response.terminal}" &' cmd = f'{terminal} "{response.terminal}" &'
logging.info("Launch terminal %s", cmd) logging.info("launching terminal %s", cmd)
os.system(cmd) os.system(cmd)
except grpc.RpcError as e: except grpc.RpcError as e:
self.app.after(0, show_grpc_error, e) self.app.after(0, show_grpc_error, e)
@ -586,7 +585,7 @@ class CoreClient:
logging.debug("Send session data to the daemon") logging.debug("Send session data to the daemon")
self.send_data() self.send_data()
response = self.client.save_xml(self.session_id, file_path) 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: except grpc.RpcError as e:
self.app.after(0, show_grpc_error, e) self.app.after(0, show_grpc_error, e)
@ -596,7 +595,7 @@ class CoreClient:
""" """
try: try:
response = self.client.open_xml(file_path) 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) self.join_session(response.session_id)
except grpc.RpcError as e: except grpc.RpcError as e:
self.app.after(0, show_grpc_error, e) self.app.after(0, show_grpc_error, e)
@ -606,7 +605,7 @@ class CoreClient:
) -> core_pb2.NodeServiceData: ) -> core_pb2.NodeServiceData:
response = self.client.get_node_service(self.session_id, node_id, service_name) response = self.client.get_node_service(self.session_id, node_id, service_name)
logging.debug( 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 return response.service
@ -640,7 +639,7 @@ class CoreClient:
self.session_id, node_id, service_name, file_name self.session_id, node_id, service_name, file_name
) )
logging.debug( 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, node_id,
service_name, service_name,
file_name, file_name,
@ -655,7 +654,7 @@ class CoreClient:
self.session_id, node_id, service_name, file_name, data self.session_id, node_id, service_name, file_name, data
) )
logging.info( 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, node_id,
service_name, service_name,
file_name, file_name,
@ -677,7 +676,7 @@ class CoreClient:
self.client.set_session_state(self.session_id, core_pb2.SessionState.DEFINITION) self.client.set_session_state(self.session_id, core_pb2.SessionState.DEFINITION)
for node_proto in node_protos: for node_proto in node_protos:
response = self.client.add_node(self.session_id, node_proto) 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: for link_proto in link_protos:
response = self.client.add_link( response = self.client.add_link(
self.session_id, self.session_id,
@ -687,7 +686,7 @@ class CoreClient:
link_proto.interface_two, link_proto.interface_two,
link_proto.options, link_proto.options,
) )
logging.debug("Create link: %s", response) logging.debug("create link: %s", response)
def send_data(self): def send_data(self):
""" """
@ -787,7 +786,7 @@ class CoreClient:
services = NodeUtils.get_custom_node_services(self.app.guiconfig, model) services = NodeUtils.get_custom_node_services(self.app.guiconfig, model)
node.services[:] = services node.services[:] = services
logging.info( logging.info(
"Add node(%s) to session(%s), coordinates(%s, %s)", "add node(%s) to session(%s), coordinates(%s, %s)",
node.name, node.name,
self.session_id, self.session_id,
x, x,
@ -963,7 +962,7 @@ class CoreClient:
response = self.client.get_wlan_config(self.session_id, node_id) response = self.client.get_wlan_config(self.session_id, node_id)
config = response.config config = response.config
logging.debug( logging.debug(
"Get wlan configuration from node %s, Result configuration: %s", "get wlan configuration from node %s, result configuration: %s",
node_id, node_id,
config, config,
) )
@ -975,7 +974,7 @@ class CoreClient:
response = self.client.get_mobility_config(self.session_id, node_id) response = self.client.get_mobility_config(self.session_id, node_id)
config = response.config config = response.config
logging.debug( logging.debug(
"Get mobility config from node %s, Result configuration: %s", "get mobility config from node %s, result configuration: %s",
node_id, node_id,
config, config,
) )
@ -993,7 +992,7 @@ class CoreClient:
) )
config = response.config config = response.config
logging.debug( 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, node_id,
model, model,
interface, interface,
@ -1009,7 +1008,7 @@ class CoreClient:
interface: int = None, interface: int = None,
): ):
logging.info( 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, node_id,
model, model,
interface, interface,
@ -1020,7 +1019,7 @@ class CoreClient:
def copy_node_service(self, _from: int, _to: int): def copy_node_service(self, _from: int, _to: int):
services = self.canvas_nodes[_from].core_node.services services = self.canvas_nodes[_from].core_node.services
self.canvas_nodes[_to].core_node.services[:] = 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): def copy_node_config(self, _from: int, _to: int):
node_type = self.canvas_nodes[_from].core_node.type node_type = self.canvas_nodes[_from].core_node.type

4
daemon/core/gui/dialogs/customnodes.py
View file

@ -219,7 +219,7 @@ class CustomNodesDialog(Dialog):
image_file = Path(self.image_file).stem image_file = Path(self.image_file).stem
node_draw = NodeDraw.from_custom(name, image_file, set(self.services)) node_draw = NodeDraw.from_custom(name, image_file, set(self.services))
logging.info( logging.info(
"Created new custom node (%s), image file (%s), services: (%s)", "created new custom node (%s), image file (%s), services: (%s)",
name, name,
image_file, image_file,
self.services, self.services,
@ -239,7 +239,7 @@ class CustomNodesDialog(Dialog):
node_draw.image = self.image node_draw.image = self.image
node_draw.services = self.services node_draw.services = self.services
logging.debug( logging.debug(
"Edit custom node (%s), image: (%s), services (%s)", "edit custom node (%s), image: (%s), services (%s)",
name, name,
self.image_file, self.image_file,
self.services, self.services,

10
daemon/core/gui/graph/graph.py
View file

@ -216,7 +216,7 @@ class CanvasGraph(tk.Canvas):
""" """
# draw existing nodes # draw existing nodes
for core_node in session.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 # peer to peer node is not drawn on the GUI
if NodeUtils.is_ignore_node(core_node.type): if NodeUtils.is_ignore_node(core_node.type):
continue continue
@ -232,7 +232,7 @@ class CanvasGraph(tk.Canvas):
# draw existing links # draw existing links
for link in session.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] canvas_node_one = self.core.canvas_nodes[link.node_one_id]
node_one = canvas_node_one.core_node node_one = canvas_node_one.core_node
canvas_node_two = self.core.canvas_nodes[link.node_two_id] canvas_node_two = self.core.canvas_nodes[link.node_two_id]
@ -795,14 +795,14 @@ class CanvasGraph(tk.Canvas):
self.tag_raise(component) self.tag_raise(component)
def update_grid(self): 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(): if self.show_grid.get():
self.itemconfig(tags.GRIDLINE, state=tk.NORMAL) self.itemconfig(tags.GRIDLINE, state=tk.NORMAL)
else: else:
self.itemconfig(tags.GRIDLINE, state=tk.HIDDEN) self.itemconfig(tags.GRIDLINE, state=tk.HIDDEN)
def set_wallpaper(self, filename: str): def set_wallpaper(self, filename: str):
logging.debug("Set wallpaper: %s", filename) logging.debug("setting wallpaper: %s", filename)
if filename: if filename:
img = Image.open(filename) img = Image.open(filename)
self.wallpaper = img self.wallpaper = img
@ -834,7 +834,7 @@ class CanvasGraph(tk.Canvas):
def copy(self): def copy(self):
if self.selection: 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() self.to_copy = self.selection.keys()
def paste(self): def paste(self):

4
daemon/core/gui/menuaction.py
View file

@ -110,11 +110,9 @@ class MenuAction:
dialog.show() dialog.show()
def help_core_github(self): def help_core_github(self):
logging.debug("Core github")
webbrowser.open_new("https://github.com/coreemu/core") webbrowser.open_new("https://github.com/coreemu/core")
def help_core_documentation(self): def help_core_documentation(self):
logging.debug("Core documentation")
webbrowser.open_new("http://coreemu.github.io/core/") webbrowser.open_new("http://coreemu.github.io/core/")
def session_options(self): def session_options(self):
@ -142,12 +140,10 @@ class MenuAction:
dialog.show() dialog.show()
def show_about(self): def show_about(self):
logging.debug("Click about")
dialog = AboutDialog(self.app, self.app) dialog = AboutDialog(self.app, self.app)
dialog.show() dialog.show()
def throughput(self): def throughput(self):
logging.debug("Click throughput")
if not self.app.core.handling_throughputs: if not self.app.core.handling_throughputs:
self.app.core.enable_throughputs() self.app.core.enable_throughputs()
else: else:

2
daemon/core/gui/statusbar.py
View file

@ -1,7 +1,6 @@
""" """
status bar status bar
""" """
import logging
import tkinter as tk import tkinter as tk
from tkinter import ttk from tkinter import ttk
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
@ -72,7 +71,6 @@ class StatusBar(ttk.Frame):
self.alerts_button.grid(row=0, column=4, sticky="ew") self.alerts_button.grid(row=0, column=4, sticky="ew")
def click_alerts(self): def click_alerts(self):
logging.debug("Click alerts")
dialog = AlertsDialog(self.app, self.app) dialog = AlertsDialog(self.app, self.app)
dialog.show() dialog.show()