Refactored stream refresh
This commit is contained in:
parent
3d2c41211f
commit
683cb5887c
1 changed files with 10 additions and 5 deletions
|
@ -49,16 +49,21 @@ def refresh_stream(stream, settings, retry=False):
|
||||||
headers = { 'Authorization': 'OAuth ' + settings.token }
|
headers = { 'Authorization': 'OAuth ' + settings.token }
|
||||||
contents = requests.get(url, headers=headers).json()
|
contents = requests.get(url, headers=headers).json()
|
||||||
if 'errorMessage' in contents:
|
if 'errorMessage' in contents:
|
||||||
|
errmsg = contents['errorMessage']
|
||||||
# Usually this is a token expired
|
# Usually this is a token expired
|
||||||
if 'token expired' in contents['errorMessage'] or 'unauthorized' in contents['errorMessage']:
|
if 'expired' in errmsg or 'unauthorized' in errmsg:
|
||||||
logger.debug(contents['errorMessage'])
|
logger.debug(errmsg)
|
||||||
if not refresh_token(settings): return False
|
if not refresh_token(settings): return False
|
||||||
# Make another attempt
|
# Make another attempt
|
||||||
if retry or not refresh_stream(stream, settings, True):
|
if retry or not refresh_stream(stream, settings, True): return False
|
||||||
return False
|
|
||||||
else:
|
else:
|
||||||
logger.error(contents['errorMessage'])
|
# Otherwise log the issue
|
||||||
|
logger.error(errmsg)
|
||||||
return False
|
return False
|
||||||
|
if not 'items' in contents:
|
||||||
|
logger.error("Could not obtain contents after retrying")
|
||||||
|
logger.debug(contents)
|
||||||
|
return False
|
||||||
for raw_entry in contents['items']:
|
for raw_entry in contents['items']:
|
||||||
eid = raw_entry['id']
|
eid = raw_entry['id']
|
||||||
# Create or update data
|
# Create or update data
|
||||||
|
|
Loading…
Reference in a new issue