From 683cb5887c27fe98d7186d3b8124aa6fe06b8ee9 Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@datalets.ch>
Date: Mon, 23 Oct 2017 10:01:02 +0200
Subject: [PATCH] Refactored stream refresh

---
 feedler/refresh.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/feedler/refresh.py b/feedler/refresh.py
index f5cc3df..707720f 100644
--- a/feedler/refresh.py
+++ b/feedler/refresh.py
@@ -49,16 +49,21 @@ def refresh_stream(stream, settings, retry=False):
     headers = { 'Authorization': 'OAuth ' + settings.token }
     contents = requests.get(url, headers=headers).json()
     if 'errorMessage' in contents:
+        errmsg = contents['errorMessage']
         # Usually this is a token expired
-        if 'token expired' in contents['errorMessage'] or 'unauthorized' in contents['errorMessage']:
-            logger.debug(contents['errorMessage'])
+        if 'expired' in errmsg or 'unauthorized' in errmsg:
+            logger.debug(errmsg)
             if not refresh_token(settings): return False
             # Make another attempt
-            if retry or not refresh_stream(stream, settings, True):
-                return False
+            if retry or not refresh_stream(stream, settings, True): return False
         else:
-            logger.error(contents['errorMessage'])
+            # Otherwise log the issue
+            logger.error(errmsg)
             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']:
         eid = raw_entry['id']
         # Create or update data