summary refs log tree commit diff
path: root/synapse/push/httppusher.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-04 17:37:34 +0000
committerErik Johnston <erik@matrix.org>2015-02-04 17:37:34 +0000
commit8046df6efa5509096c3b33c292f03f80c95b6481 (patch)
tree079a9ba974f0c3b5096438ca9cd12ac38c794390 /synapse/push/httppusher.py
parentMerge branch 'signature_failures' of github.com:matrix-org/synapse into feder... (diff)
parentMore s/instance_handle/profile_tag/ (diff)
downloadsynapse-8046df6efa5509096c3b33c292f03f80c95b6481.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into federation_client_retries
Diffstat (limited to 'synapse/push/httppusher.py')
-rw-r--r--synapse/push/httppusher.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py

index 7c6953c989..5788db4eba 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py
@@ -24,12 +24,12 @@ logger = logging.getLogger(__name__) class HttpPusher(Pusher): - def __init__(self, _hs, instance_handle, user_name, app_id, + def __init__(self, _hs, profile_tag, user_name, app_id, app_display_name, device_display_name, pushkey, pushkey_ts, data, last_token, last_success, failing_since): super(HttpPusher, self).__init__( _hs, - instance_handle, + profile_tag, user_name, app_id, app_display_name,