More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP pokes work or not yet but the retry semantics are pretty good.

1 files changed, 51 insertions, 4 deletions

diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index f3c3ca8191..33d735b974 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -14,13 +14,17 @@
 # limitations under the License.
 
 from synapse.push import Pusher, PusherConfigException
+from synapse.http.client import SimpleHttpClient
+
+from twisted.internet import defer
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 class HttpPusher(Pusher):
-    def __init__(self, _hs, user_name, app, app_display_name, device_display_name, pushkey, data, last_token):
+    def __init__(self, _hs, user_name, app, app_display_name, device_display_name, pushkey, data,
+                 last_token, last_success, failing_since):
         super(HttpPusher, self).__init__(_hs,
                                          user_name,
                                          app,
@@ -28,12 +32,55 @@ class HttpPusher(Pusher):
                                          device_display_name,
                                          pushkey,
                                          data,
-                                         last_token)
+                                         last_token,
+                                         last_success,
+                                         failing_since)
         if 'url' not in data:
             raise PusherConfigException("'url' required in data for HTTP pusher")
         self.url = data['url']
+        self.httpCli = SimpleHttpClient(self.hs)
+        self.data_minus_url = {}
+        self.data_minus_url.update(self.data)
+        del self.data_minus_url['url']
+
+    def _build_notification_dict(self, event):
+        # we probably do not want to push for every presence update
+        # (we may want to be able to set up notifications when specific
+        # people sign in, but we'd want to only deliver the pertinent ones)
+        # Actually, presence events will not get this far now because we
+        # need to filter them out in the main Pusher code.
+        if 'event_id' not in event:
+            return None
+
+        return {
+           'notification': {
+               'transition' : 'new', # everything is new for now: we don't have read receipts
+               'id': event['event_id'],
+               'type': event['type'],
+               'from': event['user_id'],
+               # we may have to fetch this over federation and we can't trust it anyway: is it worth it?
+               #'fromDisplayName': 'Steve Stevington'
+           },
+           #'counts': { -- we don't mark messages as read yet so we have no way of knowing
+           #    'unread': 1,
+           #    'missedCalls': 2
+           # },
+           'devices': {
+               self.pushkey: {
+                   'data' : self.data_minus_url
+                }
+           }
+        }
 
+    @defer.inlineCallbacks
     def dispatchPush(self, event):
-        print event
-        return True
+        notificationDict = self._build_notification_dict(event)
+        if not notificationDict:
+            defer.returnValue(True)
+        try:
+            yield self.httpCli.post_json_get_json(self.url, notificationDict)
+        except:
+            logger.exception("Failed to push %s ", self.url)
+            defer.returnValue(False)
+        defer.returnValue(True)