Merge pull request #579 from brosy/handle-newsfeed-errors

Add error handling to newsfeed
MagicMirrorOrg · Dec 31, 2016 · 65b8f78 · 65b8f78
2 parents b8167f8 + cebed08
commit 65b8f78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/js/class.js b/js/class.js
@@ -41,8 +41,8 @@
 
 		return ret;
 	};
-        })(name, prop[name]) :
-        prop[name];
+})(name, prop[name]) :
+prop[name];
 		}
 
 		// The dummy class constructor

diff --git a/modules/default/newsfeed/fetcher.js b/modules/default/newsfeed/fetcher.js
@@ -80,7 +80,12 @@ var Fetcher = function(url, reloadInterval, encoding) {
 		});
 
 		var headers = {'User-Agent':'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A'};
-		request({uri: url, encoding: null, headers: headers}).pipe(iconv.decodeStream(encoding)).pipe(parser);
+		request({uri: url, encoding: null, headers: headers})
+			.on('error', function(error) {
+				fetchFailedCallback(self, error);
+				scheduleTimer();
+			})
+			.pipe(iconv.decodeStream(encoding)).pipe(parser);
 
 	};