push.rocks/smartnginx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2019-01-18 01:33:01 +01:00
parent 6acad8a306
commit f332bf95fe
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/test.ts
View File

@ -40,6 +40,12 @@ tap.test('.deploy() should deploy a config from an instance', async () => {
await testSmartNginx.deploy(); await testSmartNginx.deploy();
}); });
tap.test('should not redeploy', async () => {
testSmartNginx.addHostCandidate(testNginxZone01);
testSmartNginx.addHostCandidate(testNginxZone02);
await testSmartNginx.deploy();
});
tap.test('.stop() should end the process', async () => { tap.test('.stop() should end the process', async () => {
testSmartNginx.nginxProcess.stop(); testSmartNginx.nginxProcess.stop();
}); });

10
ts/smartnginx.classes.smartnginx.ts
View File

@ -70,12 +70,12 @@ export class SmartNginx {
* check wether there has been a diverging host configuration * check wether there has been a diverging host configuration
* this function will only redeploy the nginx configuration in case there has been a change * this function will only redeploy the nginx configuration in case there has been a change
*/ */
private areHostsDiverged(): boolean { private async areHostsDiverged(): Promise<boolean> {
let hostCounter = 0; let hostCounter = 0;
let unfoundHosts = 0; let unfoundHosts = 0;
this.hostCandidates.forEach(hostCandidateArg => { await this.hostCandidates.forEach(async hostCandidateArg => {
let foundHost = false; let foundHost = false;
this.deployedHosts.forEach(deployedHostArg => { await this.deployedHosts.forEach(async deployedHostArg => {
if ( if (
hostCandidateArg.hostName === deployedHostArg.hostName && hostCandidateArg.hostName === deployedHostArg.hostName &&
hostCandidateArg.destination === deployedHostArg.destination hostCandidateArg.destination === deployedHostArg.destination
@ -89,7 +89,7 @@ export class SmartNginx {
} }
}); });
return ( return (
this.deployedHosts.getArray.length !== this.hostCandidates.getArray().length || this.deployedHosts.getArray().length !== this.hostCandidates.getArray().length ||
hostCounter !== this.deployedHosts.getArray().length || hostCounter !== this.deployedHosts.getArray().length ||
unfoundHosts !== 0 unfoundHosts !== 0
); );
@ -99,7 +99,7 @@ export class SmartNginx {
* deploy the current stack and restart nginx * deploy the current stack and restart nginx
*/ */
public async deploy() { public async deploy() {
if (this.areHostsDiverged()) { if (await this.areHostsDiverged()) {
this.logger.log('ok', `hosts have diverged, trigger config deployment and nginx reload!`); this.logger.log('ok', `hosts have diverged, trigger config deployment and nginx reload!`);
this.deployedHosts.wipe(); this.deployedHosts.wipe();
this.deployedHosts.addArray(this.hostCandidates.getArray()); this.deployedHosts.addArray(this.hostCandidates.getArray());