kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

3
modules/default/updatenotification/updatenotification.js
View File

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

6
package-lock.json generated
View File

@ -6155,9 +6155,9 @@
"dev": true "dev": true
}, },
"simple-git": { "simple-git": {
"version": "2.35.2", "version": "2.36.2",
"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.35.2.tgz", "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.36.2.tgz",
"integrity": "sha512-UjOKsrz92Bx7z00Wla5V6qLSf5X2XSp0sL2gzKw1Bh7iJfDPDaU7gK5avIup0yo1/sMOSUMQer2b9GcnF6nmTQ==", "integrity": "sha512-orBEf65GfSiQMsYedbJXSiRNnIRvhbeE5rrxZuEimCpWxDZOav0KLy2IEiPi1YJCF+zaC2quiJF8A4TsxI9/tw==",
"requires": { "requires": {
"@kwsites/file-exists": "^1.1.1", "@kwsites/file-exists": "^1.1.1",
"@kwsites/promise-deferred": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1",

2
package.json
View File

@ -84,7 +84,7 @@
"request": "^2.88.2", "request": "^2.88.2",
"rrule": "^2.6.8", "rrule": "^2.6.8",
"rrule-alt": "^2.2.8", "rrule-alt": "^2.2.8",
"simple-git": "^2.35.2", "simple-git": "^2.36.2",
"socket.io": "^3.1.2", "socket.io": "^3.1.2",
"valid-url": "^1.0.9" "valid-url": "^1.0.9"
}, },