diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 16:12:59 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 16:12:59 +0000 |
| commit | 41a9a76a99b5668217ed0bd97dda2b8689d13c1b (patch) | |
| tree | d0326a7a299eef31fa89d8b91fa871732a148890 /synapse/http/server.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federati... (diff) | |
| parent | Merge pull request #65 from matrix-org/get_event_cache (diff) | |
| download | synapse-41a9a76a99b5668217ed0bd97dda2b8689d13c1b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 6d084fa33c..589c30c199 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -113,6 +113,7 @@ class JsonResource(HttpServer, resource.Resource): path. """ code = None + start = self.clock.time_msec() try: # Just say yes to OPTIONS. if request.method == "OPTIONS": @@ -137,8 +138,6 @@ class JsonResource(HttpServer, resource.Resource): request.method, request.path ) - start = self.clock.time_msec() - code, response = yield path_entry.callback( request, *args |