Add users.isActivated

it's easier to see where we do activation checks
This commit is contained in:
Girish Ramakrishnan
2018-11-10 18:08:08 -08:00
parent 0c5cb9c98f
commit bd2b03876b
5 changed files with 35 additions and 14 deletions

View File

@@ -601,9 +601,9 @@ function restartMail(callback) {
function restartMailIfActivated(callback) {
assert.strictEqual(typeof callback, 'function');
users.count(function (error, count) {
users.isActivated(function (error, activated) {
if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
if (!count) {
if (!activated) {
debug('restartMailIfActivated: skipping restart of mail container since Cloudron is not activated yet');
return callback(); // not provisioned yet, do not restart container after dns setup
}