Add save/reload of narrows of server restart.

(imported from commit 2ad77845ce7d8fe365c893ab5cad06e3c725b421)
This commit is contained in:
Tim Abbott
2013-12-11 17:27:36 -05:00
parent 71ad82b6aa
commit a3fe72642b

View File

@@ -57,6 +57,7 @@ class ClientDescriptor(object):
self.all_public_streams = all_public_streams self.all_public_streams = all_public_streams
self.client_type = client_type self.client_type = client_type
self._timeout_handle = None self._timeout_handle = None
self.narrow = narrow
self.narrow_filter = build_narrow_filter(narrow) self.narrow_filter = build_narrow_filter(narrow)
# Clamp queue_timeout to between minimum and maximum timeouts # Clamp queue_timeout to between minimum and maximum timeouts
@@ -74,6 +75,7 @@ class ClientDescriptor(object):
last_connection_time=self.last_connection_time, last_connection_time=self.last_connection_time,
apply_markdown=self.apply_markdown, apply_markdown=self.apply_markdown,
all_public_streams=self.all_public_streams, all_public_streams=self.all_public_streams,
narrow=self.narrow,
client_type=self.client_type.name) client_type=self.client_type.name)
@classmethod @classmethod
@@ -81,7 +83,7 @@ class ClientDescriptor(object):
ret = cls(d['user_profile_id'], d['realm_id'], ret = cls(d['user_profile_id'], d['realm_id'],
EventQueue.from_dict(d['event_queue']), d['event_types'], EventQueue.from_dict(d['event_queue']), d['event_types'],
get_client(d['client_type']), d['apply_markdown'], d['all_public_streams'], get_client(d['client_type']), d['apply_markdown'], d['all_public_streams'],
d['queue_timeout']) d['queue_timeout'], d.get('narrow', []))
ret.last_connection_time = d['last_connection_time'] ret.last_connection_time = d['last_connection_time']
return ret return ret