diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index 6299587808..eaaa7afc91 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -15,8 +15,6 @@
# limitations under the License.
import logging
-import six
-
from prometheus_client import Counter
from twisted.internet import defer
@@ -28,9 +26,6 @@ from synapse.push import PusherConfigException
from . import push_rule_evaluator, push_tools
-if six.PY3:
- long = int
-
logger = logging.getLogger(__name__)
http_push_processed_counter = Counter(
@@ -64,6 +59,7 @@ class HttpPusher(object):
def __init__(self, hs, pusherdict):
self.hs = hs
self.store = self.hs.get_datastore()
+ self.storage = self.hs.get_storage()
self.clock = self.hs.get_clock()
self.state_handler = self.hs.get_state_handler()
self.user_id = pusherdict["user_name"]
@@ -102,7 +98,7 @@ class HttpPusher(object):
if "url" not in self.data:
raise PusherConfigException("'url' required in data for HTTP pusher")
self.url = self.data["url"]
- self.http_client = hs.get_simple_http_client()
+ self.http_client = hs.get_proxied_http_client()
self.data_minus_url = {}
self.data_minus_url.update(self.data)
del self.data_minus_url["url"]
@@ -210,14 +206,12 @@ class HttpPusher(object):
http_push_processed_counter.inc()
self.backoff_delay = HttpPusher.INITIAL_BACKOFF_SEC
self.last_stream_ordering = push_action["stream_ordering"]
- pusher_still_exists = (
- yield self.store.update_pusher_last_stream_ordering_and_success(
- self.app_id,
- self.pushkey,
- self.user_id,
- self.last_stream_ordering,
- self.clock.time_msec(),
- )
+ pusher_still_exists = yield self.store.update_pusher_last_stream_ordering_and_success(
+ self.app_id,
+ self.pushkey,
+ self.user_id,
+ self.last_stream_ordering,
+ self.clock.time_msec(),
)
if not pusher_still_exists:
# The pusher has been deleted while we were processing, so
@@ -246,8 +240,8 @@ class HttpPusher(object):
# we really only give up so that if the URL gets
# fixed, we don't suddenly deliver a load
# of old notifications.
- logger.warn(
- "Giving up on a notification to user %s, " "pushkey %s",
+ logger.warning(
+ "Giving up on a notification to user %s, pushkey %s",
self.user_id,
self.pushkey,
)
@@ -299,9 +293,8 @@ class HttpPusher(object):
if pk != self.pushkey:
# for sanity, we only remove the pushkey if it
# was the one we actually sent...
- logger.warn(
- ("Ignoring rejected pushkey %s because we" " didn't send it"),
- pk,
+ logger.warning(
+ ("Ignoring rejected pushkey %s because we didn't send it"), pk,
)
else:
logger.info("Pushkey %s was rejected: removing", pk)
@@ -320,7 +313,7 @@ class HttpPusher(object):
{
"app_id": self.app_id,
"pushkey": self.pushkey,
- "pushkey_ts": long(self.pushkey_ts / 1000),
+ "pushkey_ts": int(self.pushkey_ts / 1000),
"data": self.data_minus_url,
}
],
@@ -329,7 +322,7 @@ class HttpPusher(object):
return d
ctx = yield push_tools.get_context_for_event(
- self.store, self.state_handler, event, self.user_id
+ self.storage, self.state_handler, event, self.user_id
)
d = {
@@ -349,7 +342,7 @@ class HttpPusher(object):
{
"app_id": self.app_id,
"pushkey": self.pushkey,
- "pushkey_ts": long(self.pushkey_ts / 1000),
+ "pushkey_ts": int(self.pushkey_ts / 1000),
"data": self.data_minus_url,
"tweaks": tweaks,
}
@@ -400,7 +393,7 @@ class HttpPusher(object):
Args:
badge (int): number of unread messages
"""
- logger.info("Sending updated badge count %d to %s", badge, self.name)
+ logger.debug("Sending updated badge count %d to %s", badge, self.name)
d = {
"notification": {
"id": "",
@@ -411,7 +404,7 @@ class HttpPusher(object):
{
"app_id": self.app_id,
"pushkey": self.pushkey,
- "pushkey_ts": long(self.pushkey_ts / 1000),
+ "pushkey_ts": int(self.pushkey_ts / 1000),
"data": self.data_minus_url,
}
],
|
