diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-01 13:14:04 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-01 13:14:04 +0000 |
| commit | 4a9055d4465d5d6059612e7c89f2b5774efc0e18 (patch) | |
| tree | f5d146248431ce35f1ad810267024af4eb907bdf /synapse/app | |
| parent | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-4a9055d4465d5d6059612e7c89f2b5774efc0e18.tar.xz | |
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/pusher.py | 4 | ||||
| -rwxr-xr-x | synapse/app/synctl.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index d59f4a571c..1a6f5507a9 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -197,7 +197,7 @@ class PusherServer(HomeServer): yield start_pusher(user_id, app_id, pushkey) stream = results.get("events") - if stream: + if stream and stream["rows"]: min_stream_id = stream["rows"][0][0] max_stream_id = stream["position"] preserve_fn(pusher_pool.on_new_notifications)( @@ -205,7 +205,7 @@ class PusherServer(HomeServer): ) stream = results.get("receipts") - if stream: + if stream and stream["rows"]: rows = stream["rows"] affected_room_ids = set(row[1] for row in rows) min_stream_id = rows[0][0] diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py index bb41962d47..c045588866 100755 --- a/synapse/app/synctl.py +++ b/synapse/app/synctl.py @@ -24,7 +24,7 @@ import subprocess import sys import yaml -SYNAPSE = ["python", "-B", "-m", "synapse.app.homeserver"] +SYNAPSE = [sys.executable, "-B", "-m", "synapse.app.homeserver"] GREEN = "\x1b[1;32m" RED = "\x1b[1;31m" |