paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

middleware: Change write_log_line to publish as a dict.

Browse Source 
We were seeing errors when pubishing typical events in the form of
`Dict[str, Any]` as the expected type to be a `Union`.  So we instead
change the only non-dictionary call, to pass a dict instead of `str`.
This commit is contained in:
Wyatt Hoodes
2019-07-22 10:08:03 -10:00
committed by Tim Abbott
parent dd19e2df1b
commit 5686821150
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/worker/queue_processors.py
View File

@@ -390,11 +390,9 @@ class SlowQueryWorker(LoopQueueProcessingWorker):
# Sleep 1 minute between checking the queue
sleep_delay = 60 * 1
# TODO: The type annotation here should be List[str], but that
# creates conflicts with other users in the file.
def consume_batch(self, slow_queries: List[Any]) -> None:
for query in slow_queries:
logging.info("Slow query: %s" % (query,))
def consume_batch(self, slow_query_events: List[Dict[str, Any]]) -> None:
for event in slow_query_events:
logging.info("Slow query: %s" % (event["query"],))
if settings.SLOW_QUERY_LOGS_STREAM is None:
return
@@ -402,12 +400,12 @@ class SlowQueryWorker(LoopQueueProcessingWorker):
if settings.ERROR_BOT is None:
return
if len(slow_queries) > 0:
if len(slow_query_events) > 0:
topic = "%s: slow queries" % (settings.EXTERNAL_HOST,)
content = ""
for query in slow_queries:
content += " %s\n" % (query,)
for event in slow_query_events:
content += " %s\n" % (event["query"],)
error_bot_realm = get_system_bot(settings.ERROR_BOT).realm
internal_send_message(error_bot_realm, settings.ERROR_BOT,