summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-26 16:11:28 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-26 16:11:28 +0000
commit7f6f3f9d6247076493c4e9d48c8282e25892f8b5 (patch)
treeb11995b879aa075b79b5899bf33e4f119f8db74d /synapse/server.py
parentAdd client v2_alpha resource to synapse server resource tree (diff)
downloadsynapse-7f6f3f9d6247076493c4e9d48c8282e25892f8b5.tar.xz
Pass the current time to serialize event, rather than passing an
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 92ed2c5e32..c478f812e6 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -124,9 +124,6 @@ class BaseHomeServer(object): setattr(BaseHomeServer, "get_%s" % (depname), _get) - def serialize_event(self, e, as_client_event=True): - return serialize_event(self, e, as_client_event) - def get_ip_from_request(self, request): # May be an X-Forwarding-For header depending on config ip_addr = request.getClientIP()