Updating simple-git and using timeout when checking for module updates

This commit is contained in:
buxxi
2021-03-13 11:58:33 +01:00
parent 3ed223a550
commit 401a6f3417
4 changed files with 13 additions and 8 deletions

View File

@@ -18,7 +18,7 @@ module.exports = NodeHelper.create({
// Push MagicMirror itself , biggest chance it'll show up last in UI and isn't overwritten
// others will be added in front
// this method returns promises so we can't wait for every one to resolve before continuing
simpleGits.push({ module: "default", git: SimpleGit(path.normalize(__dirname + "/../../../")) });
simpleGits.push({ module: "default", git: this.createGit(path.normalize(__dirname + "/../../../")) });
for (let moduleName in modules) {
if (!this.ignoreUpdateChecking(moduleName)) {
@@ -55,7 +55,7 @@ module.exports = NodeHelper.create({
},
resolveRemote: async function (moduleFolder) {
let git = SimpleGit(moduleFolder);
let git = this.createGit(moduleFolder);
let remotes = await git.getRemotes(true);
if (remotes.length < 1 || remotes[0].name.length < 1) {
@@ -81,7 +81,7 @@ module.exports = NodeHelper.create({
});
}
} catch (err) {
Log.error("Failed to fetch data for git: " + err);
Log.error("Failed to fetch git data for " + sg.module + ": " + err);
}
}
@@ -100,6 +100,10 @@ module.exports = NodeHelper.create({
}, delay);
},
createGit: function (folder) {
return SimpleGit({ baseDir: folder, timeout: { block: this.config.timeout } });
},
ignoreUpdateChecking: function (moduleName) {
// Should not check for updates for default modules
if (defaultModules.indexOf(moduleName) >= 0) {

View File

@@ -8,7 +8,8 @@ Module.register("updatenotification", {
defaults: {
updateInterval: 10 * 60 * 1000, // every 10 minutes
refreshInterval: 24 * 60 * 60 * 1000, // one day
ignoreModules: []
ignoreModules: [],
timeout: 1000
},
suspended: false,