perso/syncserver
perso/syncserver
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update github-hosted dependencies to latest versions

Browse Source
This commit is contained in:
Ryan Kelly 2015-11-23 14:15:13 +11:00
parent a521aed39f
commit 150cef8745
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
requirements.txt
View File

@ -8,6 +8,6 @@ SQLAlchemy==0.9.4
unittest2==0.5.1 unittest2==0.5.1
zope.component==4.2.1 zope.component==4.2.1
configparser==3.5.0b2 configparser==3.5.0b2
https://github.com/mozilla-services/mozservices/archive/e00e1b68130423ad98d0f6185655bde650443da8.zip https://github.com/mozilla-services/mozservices/archive/706e09b78a78ebff4f71dcaca2fd7b68fa2885fb.zip
https://github.com/mozilla-services/tokenserver/archive/92361b0e7b0bff996a8fff9c894c7be850d12d16.zip https://github.com/mozilla-services/tokenserver/archive/1.2.16.zip
https://github.com/mozilla-services/server-syncstorage/archive/1.5.11.zip https://github.com/mozilla-services/server-syncstorage/archive/1.5.13.zip

5
syncserver/staticnode.py
View File

@ -138,6 +138,7 @@ class StaticNodeAssignment(object):
'node': self.node_url, 'node': self.node_url,
'generation': row.generation, 'generation': row.generation,
'client_state': row.client_state, 'client_state': row.client_state,
'first_seen_at': row.created_at,
'old_client_states': {} 'old_client_states': {}
} }
# Any subsequent rows are due to old client-state values. # Any subsequent rows are due to old client-state values.
@ -150,9 +151,10 @@ class StaticNodeAssignment(object):
res.close() res.close()
def allocate_user(self, service, email, generation=0, client_state=''): def allocate_user(self, service, email, generation=0, client_state=''):
now = get_timestamp()
params = { params = {
'service': service, 'email': email, 'generation': generation, 'service': service, 'email': email, 'generation': generation,
'client_state': client_state, 'timestamp': get_timestamp() 'client_state': client_state, 'timestamp': now
} }
try: try:
res = self._engine.execute(_CREATE_USER_RECORD, **params) res = self._engine.execute(_CREATE_USER_RECORD, **params)
@ -167,6 +169,7 @@ class StaticNodeAssignment(object):
'node': self.node_url, 'node': self.node_url,
'generation': generation, 'generation': generation,
'client_state': client_state, 'client_state': client_state,
'first_seen_at': now,
'old_client_states': {} 'old_client_states': {}
} }