Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

bring in changes from eehouse.org

Browse source 
This is what's been running for months, so committing it.
This commit is contained in:
Eric House 2019-07-06 11:13:50 -07:00
parent 475206a373
commit 1ce243904e
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
xwords4/relay/scripts/fcm_loop.py
View file

@ -187,17 +187,17 @@ def notifyViaFCM( devids, typ, target ):
return success
def shouldSend(val):
return g_sendAll or val == 1
# pow = 1
# while pow < val:
# pow *= 3
# return pow == val
pow = 1
while pow < val: pow *= 2
result = pow == val
# print "shouldSend(", val, ") =>", result
return result
# given a list of msgid, devid lists, figure out which messages should
# be sent/resent now and mark them as sent. Backoff is based on
# msgids: if the only messages a device has pending have been seen
# before, backoff applies.
def targetsAfterBackoff( msgs ):
def targetsAfterBackoff( msgs, ignoreBackoff ):
global g_sent
targets = {}
for row in msgs:
@ -206,8 +206,10 @@ def targetsAfterBackoff( msgs ):
if not msgid in g_sent:
g_sent[msgid] = 0
g_sent[msgid] += 1
if shouldSend( g_sent[msgid] ):
targets[devid] = row
if ignoreBackoff or shouldSend( g_sent[msgid] ):
if not devid in targets: targets[devid] = []
targets[devid].append(row)
print "targetsAfterBackoff() using:", g_sent
return targets
# devids is an array of (msgid, devid) tuples
@ -272,8 +274,8 @@ def main():
# print "got msgs:", len(devids)
if 0 < len(devids):
devids = addClntVers( g_con, devids )
targets = targetsAfterBackoff( devids )
# print "got targets:", len(targets)
targets = targetsAfterBackoff( devids, False )
print 'got', len(targets), 'targets'
if 0 < len(targets):
if 0 < emptyCount: print ""
emptyCount = 0
@ -281,12 +283,12 @@ def main():
if g_debug: print "devices needing notification:", targets, '=>',
toDelete = []
for devid in targets.keys():
target = targets[devid]
if notifyViaFCM( asGCMIds(g_con, [devid], typ), typ, target ) \
and 3 <= target['clntVers'] \
and target['msg64']:
toDelete.append( str(target['id']) )
nSent += 1
for targetRow in targets[devid]:
if notifyViaFCM( asGCMIds(g_con, [devid], typ), typ, targetRow ) \
and 3 <= targetRow['clntVers'] \
and targetRow['msg64']:
toDelete.append( str(targetRow['id']) )
nSent += 1
pruneSent( devids )
deleteMsgs( g_con, toDelete )
elif g_debug: print "no targets after backoff"