Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tornado: Refactor logic for persistent queue filenames. 

Now, these are computed using a function, which will make it easier to
edit these paths to depend on which Tornado process it is in coming
commits.
This commit is contained in:
Tim Abbott 2018-10-03 15:14:16 -07:00
parent 98f28fa6ce
commit cf24a20185
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/tornado/event_queue.py
View File

@ -417,10 +417,15 @@ def gc_event_queues() -> None:
statsd.gauge('tornado.active_queues', len(clients))
statsd.gauge('tornado.active_users', len(user_clients))
def persistent_queue_filename(last=False) -> str:
if last:
return "/var/tmp/event_queues.json.last"
return settings.JSON_PERSISTENT_QUEUE_FILENAME_PATTERN % ('',)
def dump_event_queues() -> None:
start = time.time()
with open(settings.JSON_PERSISTENT_QUEUE_FILENAME, "w") as stored_queues:
with open(persistent_queue_filename(), "w") as stored_queues:
ujson.dump([(qid, client.to_dict()) for (qid, client) in clients.items()],
stored_queues)
@ -435,7 +440,7 @@ def load_event_queues() -> None:
# file reading from the loading so that we don't silently fail if we get
# bad input.
try:
with open(settings.JSON_PERSISTENT_QUEUE_FILENAME, "r") as stored_queues:
with open(persistent_queue_filename(), "r") as stored_queues:
json_data = stored_queues.read()
try:
clients = dict((qid, ClientDescriptor.from_dict(client))
@ -470,7 +475,7 @@ def setup_event_queue() -> None:
tornado.autoreload.add_reload_hook(dump_event_queues)
try:
os.rename(settings.JSON_PERSISTENT_QUEUE_FILENAME, "/var/tmp/event_queues.json.last")
os.rename(persistent_queue_filename(), persistent_queue_filename(last=True))
except OSError:
pass

2
zproject/settings.py
View File

@ -1027,7 +1027,7 @@ ZULIP_PATHS = [
("ERROR_FILE_LOG_PATH", "/var/log/zulip/errors.log"),
("MANAGEMENT_LOG_PATH", "/var/log/zulip/manage.log"),
("WORKER_LOG_PATH", "/var/log/zulip/workers.log"),
("JSON_PERSISTENT_QUEUE_FILENAME", "/home/zulip/tornado/event_queues.json"),
("JSON_PERSISTENT_QUEUE_FILENAME_PATTERN", "/home/zulip/tornado/event_queues%s.json"),
("EMAIL_LOG_PATH", "/var/log/zulip/send_email.log"),
("EMAIL_MIRROR_LOG_PATH", "/var/log/zulip/email_mirror.log"),
("EMAIL_DELIVERER_LOG_PATH", "/var/log/zulip/email-deliverer.log"),