jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Only send update notification mails if autoupdate is disabled

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-27 09:24:36 -08:00
parent f6a9e1f4d8
commit 68c36e8a18
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/updatechecker.js
View File

@@ -12,6 +12,7 @@ exports = module.exports = {
var apps = require('./apps.js'), var apps = require('./apps.js'),
async = require('async'), async = require('async'),
config = require('./config.js'), config = require('./config.js'),
constants = require('./constants.js'),
debug = require('debug')('box:updatechecker'), debug = require('debug')('box:updatechecker'),
mailer = require('./mailer.js'), mailer = require('./mailer.js'),
paths = require('./paths.js'), paths = require('./paths.js'),
@@ -162,8 +163,15 @@ function checkAppUpdates(callback) {
} else if (semver.satisfies(newState[app.id], '~' + app.manifest.version)) { } else if (semver.satisfies(newState[app.id], '~' + app.manifest.version)) {
debug('Skipping notification of app update as this is a patch release'); debug('Skipping notification of app update as this is a patch release');
} else { } else {
debug('Notifying user of app update for %s from %s to %s', app.id, app.manifest.version, updateInfo.manifest.version); // only send notifications if update pattern is 'never'
mailer.appUpdateAvailable(app, updateInfo); settings.getAutoupdatePattern(function (error, result) {
if (error) return console.error(error);
if (result !== constants.AUTOUPDATE_PATTERN_NEVER) return;
debug('Notifying user of app update for %s from %s to %s', app.id, app.manifest.version, updateInfo.manifest.version);
mailer.appUpdateAvailable(app, updateInfo);
});
} }
iteratorDone(); iteratorDone();
@@ -209,7 +217,13 @@ function checkBoxUpdates(callback) {
if (semver.satisfies(gBoxUpdateInfo.version, '~' + config.version())) { if (semver.satisfies(gBoxUpdateInfo.version, '~' + config.version())) {
debug('Skipping notification of box update as this is a patch release'); debug('Skipping notification of box update as this is a patch release');
} else { } else {
mailer.boxUpdateAvailable(updateInfo.version, updateInfo.changelog); // only send notifications if update pattern is 'never'
settings.getAutoupdatePattern(function (error, result) {
if (error) return console.error(error);
if (result !== constants.AUTOUPDATE_PATTERN_NEVER) return;
mailer.boxUpdateAvailable(updateInfo.version, updateInfo.changelog);
});
} }
state.box = updateInfo.version; state.box = updateInfo.version;