summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 10:34:41 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 10:34:41 +0000
commit6370cffbbfc0bcfa4465453c24c535ef755db4f1 (patch)
tree5b9ad1eaa2e3c32007d8de5aaccadbd087583b6d
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-6370cffbbfc0bcfa4465453c24c535ef755db4f1.tar.xz
Fix bug where variable was not always defined
-rw-r--r--synapse/http/server.py3
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