diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-14 03:11:11 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 03:11:11 +1000 |
| commit | 7c27c4d51cfd2a3d6504889b1ccdddabf38ae05c (patch) | |
| tree | 1b3523ee1e3e68f0ab4ca66c160562252641da0b /synapse/push/httppusher.py | |
| parent | Merge pull request #3856 from matrix-org/erikj/speed_up_purge (diff) | |
| download | synapse-7c27c4d51cfd2a3d6504889b1ccdddabf38ae05c.tar.xz | |
merge (#3576)
Diffstat (limited to 'synapse/push/httppusher.py')
| -rw-r--r-- | synapse/push/httppusher.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 81e18bcf7d..48abd5e4d6 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -15,6 +15,8 @@ # limitations under the License. import logging +import six + from prometheus_client import Counter from twisted.internet import defer @@ -26,6 +28,9 @@ from synapse.util.metrics import Measure from . import push_rule_evaluator, push_tools +if six.PY3: + long = int + logger = logging.getLogger(__name__) http_push_processed_counter = Counter("synapse_http_httppusher_http_pushes_processed", "") @@ -96,7 +101,7 @@ class HttpPusher(object): @defer.inlineCallbacks def on_new_notifications(self, min_stream_ordering, max_stream_ordering): - self.max_stream_ordering = max(max_stream_ordering, self.max_stream_ordering) + self.max_stream_ordering = max(max_stream_ordering, self.max_stream_ordering or 0) yield self._process() @defer.inlineCallbacks |