kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-30 13:09:34 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Add error handling to newsfeed
This commit is contained in:
Michael Teeuw 2016-12-31 19:13:01 +01:00 committed by GitHub
commit 65b8f78ca1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/class.js
View File

@ -41,8 +41,8 @@
return ret; return ret;
}; };
})(name, prop[name]) : })(name, prop[name]) :
prop[name]; prop[name];
} }
// The dummy class constructor // The dummy class constructor

7
modules/default/newsfeed/fetcher.js
View File

@ -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'}; 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);
}; };