From 150cef87457d226862fc831810c11ee9cf80bfb0 Mon Sep 17 00:00:00 2001 From: Ryan Kelly Date: Mon, 23 Nov 2015 14:15:13 +1100 Subject: [PATCH] Update github-hosted dependencies to latest versions --- requirements.txt | 6 +++--- syncserver/staticnode.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6b0c427..1891c4d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,6 @@ SQLAlchemy==0.9.4 unittest2==0.5.1 zope.component==4.2.1 configparser==3.5.0b2 -https://github.com/mozilla-services/mozservices/archive/e00e1b68130423ad98d0f6185655bde650443da8.zip -https://github.com/mozilla-services/tokenserver/archive/92361b0e7b0bff996a8fff9c894c7be850d12d16.zip -https://github.com/mozilla-services/server-syncstorage/archive/1.5.11.zip +https://github.com/mozilla-services/mozservices/archive/706e09b78a78ebff4f71dcaca2fd7b68fa2885fb.zip +https://github.com/mozilla-services/tokenserver/archive/1.2.16.zip +https://github.com/mozilla-services/server-syncstorage/archive/1.5.13.zip diff --git a/syncserver/staticnode.py b/syncserver/staticnode.py index 560d3ac..165b670 100644 --- a/syncserver/staticnode.py +++ b/syncserver/staticnode.py @@ -138,6 +138,7 @@ class StaticNodeAssignment(object): 'node': self.node_url, 'generation': row.generation, 'client_state': row.client_state, + 'first_seen_at': row.created_at, 'old_client_states': {} } # Any subsequent rows are due to old client-state values. @@ -150,9 +151,10 @@ class StaticNodeAssignment(object): res.close() def allocate_user(self, service, email, generation=0, client_state=''): + now = get_timestamp() params = { 'service': service, 'email': email, 'generation': generation, - 'client_state': client_state, 'timestamp': get_timestamp() + 'client_state': client_state, 'timestamp': now } try: res = self._engine.execute(_CREATE_USER_RECORD, **params) @@ -167,6 +169,7 @@ class StaticNodeAssignment(object): 'node': self.node_url, 'generation': generation, 'client_state': client_state, + 'first_seen_at': now, 'old_client_states': {} }