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

Fix unregisterSubdomain to work during migration from single to multidomain

Browse Source 
oldConfig.domain was previously not there and thus might be missing
still
This commit is contained in:
Johannes Zellner
2017-11-10 00:11:28 +01:00
parent a52747cde0
commit 1cee0f3831
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apptask.js
+6 -3
View File
@@ -277,12 +277,15 @@ function registerSubdomain(app, overwrite, callback) {
});
}
function unregisterSubdomain(app, domain, location, callback) {
function unregisterSubdomain(app, location, domain, callback) {
assert.strictEqual(typeof app, 'object');
assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof location, 'string');
assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof callback, 'function');
// FIXME remove the oldConfig.domain fallback in following releases
domain = domain || config.fqdn();
// do not unregister bare domain because we show a error/cloudron info page there
if (!config.isCustomDomain() && location === '') {
debugApp(app, 'Skip unregister of empty subdomain');
@@ -298,7 +301,7 @@ function unregisterSubdomain(app, domain, location, callback) {
if (error) return callback(error);
async.retry({ times: 30, interval: 5000 }, function (retryCallback) {
debugApp(app, 'Unregistering subdomain: %s', config.appFqdn(app));
debugApp(app, 'Unregistering subdomain: %s', config.appFqdn({ domain: domain, location: location }));
domains.removeDNSRecords(config.appFqdn({ domain: domain, location: location }), 'A', [ ip ], function (error) {
if (error && (error.reason === DomainError.STILL_BUSY || error.reason === DomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again