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

Enhance Tornado logging with Handler stats.

Browse Source 
This was useful data for debugging handler/memory leaks.
This commit is contained in:
Tim Abbott
2016-03-20 16:31:18 -07:00
parent e51811aa9e
commit 0419430000
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/event_queue.py
View File

@@ -21,7 +21,7 @@ from zerver.lib.cache import cache_get_many, message_cache_key, \
user_profile_by_id_cache_key, cache_save_user_profile user_profile_by_id_cache_key, cache_save_user_profile
from zerver.lib.cache_helpers import cache_with_key from zerver.lib.cache_helpers import cache_with_key
from zerver.lib.handlers import clear_handler_by_id, get_handler_by_id, \ from zerver.lib.handlers import clear_handler_by_id, get_handler_by_id, \
finish_handler finish_handler, handler_stats_string
from zerver.lib.utils import statsd from zerver.lib.utils import statsd
from zerver.middleware import async_request_restart from zerver.middleware import async_request_restart
from zerver.lib.narrow import build_narrow_filter from zerver.lib.narrow import build_narrow_filter
@@ -370,9 +370,9 @@ def gc_event_queues():
do_gc_event_queues(to_remove, affected_users, affected_realms) do_gc_event_queues(to_remove, affected_users, affected_realms)
logging.info(('Tornado removed %d idle event queues owned by %d users in %.3fs.' logging.info(('Tornado removed %d idle event queues owned by %d users in %.3fs.'
+ ' Now %d active queues') + ' Now %d active queues, %s')
% (len(to_remove), len(affected_users), time.time() - start, % (len(to_remove), len(affected_users), time.time() - start,
len(clients))) len(clients), handler_stats_string()))
statsd.gauge('tornado.active_queues', len(clients)) statsd.gauge('tornado.active_queues', len(clients))
statsd.gauge('tornado.active_users', len(user_clients)) statsd.gauge('tornado.active_users', len(user_clients))

3
zerver/lib/handlers.py
View File

@@ -17,6 +17,9 @@ def allocate_handler_id(handler):
def clear_handler_by_id(handler_id): def clear_handler_by_id(handler_id):
del handlers[handler_id] del handlers[handler_id]
def handler_stats_string():
return "%s handlers, latest ID %s" % (len(handlers), current_handler_id)
def finish_handler(handler_id, event_queue_id, contents, apply_markdown): def finish_handler(handler_id, event_queue_id, contents, apply_markdown):
err_msg = "Got error finishing handler for queue %s" % (event_queue_id,) err_msg = "Got error finishing handler for queue %s" % (event_queue_id,)
try: try: