Skip to content

Commit 827a698

Browse files
committed
Always log who performed an action.
This makes logs consistent for easier parsing
1 parent d5ac2e2 commit 827a698

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cylc/flow/network/resolvers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ async def _mutation_mapper(
725725
"""
726726
user = meta.get('auth_user', self.schd.owner)
727727
if user == self.schd.owner:
728-
log_user = "" # don't log user name if owner
728+
log_user = f" from {self.schd.owner}"
729729
else:
730730
log_user = f" from {user}"
731731

tests/integration/network/test_resolvers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,8 @@ async def test_command_logging(mock_flow, caplog, log_filter):
244244
}
245245
meta["auth_user"] = mock_flow.owner
246246
await mock_flow.resolvers._mutation_mapper("put_messages", kwargs, meta)
247-
assert not log_filter(contains='Command "put_messages" received:')
247+
assert not log_filter(
248+
contains=f'Command "put_messages" received from {mock_flow.owner}')
248249

249250
meta["auth_user"] = "Dr Spock"
250251
await mock_flow.resolvers._mutation_mapper("put_messages", kwargs, meta)

0 commit comments

Comments
 (0)