Changeset 60:ec70c7dc68b6 in stamper

Timestamp:

Dec 28, 2014, 12:57:07 PM (10 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Improvements on the code to push stamps to a remote collector server:

• The collector server returns now a list of exposed api methods/urls after logging in. That means we do not need to set the url to the listener anymore (stamper can learn from the collector's response)

• The collector handles fine now push actions to add/append stamps to its database, returning the number of stamps that are added, updated or deleted to/from the database. That means we can show a bit more information to the user after the push

• The responses from the collector are json-encoded, so now we try to de-serialize the data, showing an error if that is not posible (badly-formatted json, error/exception, etc).

Files:

• etc/stamper.conf (modified) (1 diff)
• stamper/stamper.py (modified) (1 diff)

etc/stamper.conf

@@ -18 +18 @@
 base_url = http://localhost:8000
 login_path = /stamper/login/
-listen_path = /stamper/listen/
 user = CHANGEME
 password = SECRET

stamper/stamper.py

@@ -454 +454 @@
         stamps = json.dumps(stamps, indent=4)
         http_client = HTTPClient(self.collector['base_url'])
-        http_client.post(self.collector['login_path'],
-                         {'username': self.collector['user'],
-                          'password': self.collector['password']})
-        http_client.post(self.collector['listen_path'], {'stamps': stamps})
+        response = http_client.post(self.collector['login_path'],
+                                    {'username': self.collector['user'],
+                                    'password': self.collector['password']})
+        # response is a json-encoded list of end-points from the collector api
+        try:
+            api = json.loads(response)
+        except ValueError:
+            print('[error] No valid api end points can be retrieved')
+            return
+
+        response = http_client.post(api['push'], {'stamps': stamps})
+
+        # response is a json-encoded dict, containing lists of added, updated
+        # and deleted stamps (on the other side)
+        try:
+            results = json.loads(response)
+        except ValueError:
+            print('[error] stamps pushed, can not retrieve results information')
+            return
+
+        # display information
+        for k in results.keys():
+            print('%(stamps)d stamps %(action)s' % {'stamps': len(results[k]),
+                                                    'action': k})