tweak to session.exception to default node_id to None when not provided

This commit is contained in:
Blake Harnden 2020-03-31 16:39:27 -07:00
parent 3165bddc92
commit 091131fe5c
4 changed files with 6 additions and 6 deletions
daemon

View file

@ -637,7 +637,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
:param str source: source where exception came from
:param str text: details about exception
:param int node: node id, if related to a specific node
:return:
:return: nothing
"""
exception_data = ExceptionData(
session=self.session.id,

View file

@ -1218,7 +1218,7 @@ class Session:
)
logging.exception(message)
self.exception(
ExceptionLevels.ERROR, "Session.run_state_hooks", None, message
ExceptionLevels.ERROR, "Session.run_state_hooks", message
)
def add_state_hook(
@ -1451,15 +1451,15 @@ class Session:
)
def exception(
self, level: ExceptionLevels, source: str, node_id: int, text: str
self, level: ExceptionLevels, source: str, text: str, node_id: int = None
) -> None:
"""
Generate and broadcast an exception event.
:param level: exception level
:param source: source name
:param node_id: node related to exception
:param text: exception message
:param node_id: node related to exception
:return: nothing
"""
exception_data = ExceptionData(

View file

@ -630,8 +630,8 @@ class CoreServices:
self.session.exception(
ExceptionLevels.ERROR,
"services",
node.id,
f"error stopping service {service.name}: {e.stderr}",
node.id,
)
logging.exception("error running stop command %s", args)
status = -1

View file

@ -1117,7 +1117,7 @@ class TestGrpc:
with client.context_connect():
client.events(session.id, handle_event)
time.sleep(0.1)
session.exception(exception_level, source, node_id, text)
session.exception(exception_level, source, text, node_id)
# then
queue.get(timeout=5)