fix(core): update

This commit is contained in:
Philipp Kunz 2019-01-01 22:34:36 +01:00
parent b87ca1fa03
commit 0b97aaee91
4 changed files with 698 additions and 143 deletions

815
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -24,17 +24,17 @@
}, },
"homepage": "https://gitlab.com/pushrocks/smartnginx#README", "homepage": "https://gitlab.com/pushrocks/smartnginx#README",
"dependencies": { "dependencies": {
"@pushrocks/smartfile": "^6.0.6", "@pushrocks/smartfile": "^6.0.11",
"@pushrocks/smartlog": "^2.0.1", "@pushrocks/smartlog": "^2.0.9",
"@pushrocks/smartpromise": "^2.0.5", "@pushrocks/smartpromise": "^2.0.5",
"@pushrocks/smartshell": "^2.0.6", "@pushrocks/smartshell": "^2.0.13",
"@pushrocks/smartstring": "^3.0.0" "@pushrocks/smartstring": "^3.0.5"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.0.22", "@gitzone/tsbuild": "^2.1.4",
"@gitzone/tsrun": "^1.1.12", "@gitzone/tsrun": "^1.1.17",
"@gitzone/tstest": "^1.0.13", "@gitzone/tstest": "^1.0.18",
"@pushrocks/tapbundle": "^3.0.5", "@pushrocks/tapbundle": "^3.0.7",
"qenv": "^1.1.7" "qenv": "^1.1.7"
} }
} }

View File

@ -37,7 +37,7 @@ export class NginxProcess {
); );
} }
this.started = true; this.started = true;
plugins.smartlog.defaultLogger.info('started Nginx!'); plugins.smartlog.defaultLogger.log('info', 'started Nginx!');
done.resolve(); done.resolve();
return done.promise; return done.promise;
} }
@ -52,7 +52,7 @@ export class NginxProcess {
} else { } else {
this.smartshellInstance.exec('nginx -s reload'); this.smartshellInstance.exec('nginx -s reload');
} }
plugins.smartlog.defaultLogger.info('NginxProcess has loaded the new config!'); plugins.smartlog.defaultLogger.log('info', 'NginxProcess has loaded the new config!');
done.resolve(); done.resolve();
return done.promise; return done.promise;
} }
@ -65,9 +65,9 @@ export class NginxProcess {
if (typeof this.nginxChildProcess != 'undefined') { if (typeof this.nginxChildProcess != 'undefined') {
this.smartshellInstance.exec('nginx -s quit'); this.smartshellInstance.exec('nginx -s quit');
this.started = false; this.started = false;
plugins.smartlog.defaultLogger.info('stopped Nginx!'); plugins.smartlog.defaultLogger.log('info', 'stopped Nginx!');
} else { } else {
plugins.smartlog.defaultLogger.info('nginx already stopped!'); plugins.smartlog.defaultLogger.log('info', 'nginx already stopped!');
} }
done.resolve(); done.resolve();
return done.promise; return done.promise;

View File

@ -79,7 +79,7 @@ export class SmartNginx {
let promiseArray = []; let promiseArray = [];
for (let host of this.hosts) { for (let host of this.hosts) {
await host.deploy(); await host.deploy();
plugins.smartlog.defaultLogger.info(`Host ${host.hostName} deployed!`); plugins.smartlog.defaultLogger.log('info', `Host ${host.hostName} deployed!`);
this.nginxProcess.reloadConfig(); this.nginxProcess.reloadConfig();
}; };
} }