Merge pull request #14 from Psychopoulet/dev

correction
Psychopoulet · Aug 8, 2016 · e66a2f9 · e66a2f9
2 parents 0438252 + 77a92d9
commit e66a2f9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 18 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -123,34 +123,41 @@ module.exports = class MultiWebservers {
 
 	listen(requestListener) {
 
-		if (!requestListener) {
-			return Promise.reject("There is no requestListener");
+		if (this.listening()) {
+			return Promise.resolve();
 		}
-			else if ("function" !== typeof requestListener) {
-				return Promise.reject("requestListener is not a function");
-			}
 		else {
 
-			return new Promise((resolve) => {
+			if (!requestListener) {
+				return Promise.reject("There is no requestListener");
+			}
+				else if ("function" !== typeof requestListener) {
+					return Promise.reject("requestListener is not a function");
+				}
+			else {
 
-				let serversStarted = 0;
-				this.servers.forEach((current, i) => {
+				return new Promise((resolve) => {
 
-					this.servers[i].server = (current.options.ssl) ? https.createServer(current.options, requestListener) : http.createServer(requestListener);
-					this.servers[i].server = httpshutdown(this.servers[i].server).listen(current.options, () => {
+					let serversStarted = 0;
+					this.servers.forEach((current, i) => {
 
-						++serversStarted;
+						this.servers[i].server = (current.options.ssl) ? https.createServer(current.options, requestListener) : http.createServer(requestListener);
+						this.servers[i].server = httpshutdown(this.servers[i].server).listen(current.options, () => {
 
-						if (serversStarted >= this.servers.length) {
-							resolve();
-						}
+							++serversStarted;
+
+							if (serversStarted >= this.servers.length) {
+								resolve();
+							}
+
+						});
 
 					});
 
 				});
-
-			});
-			
+				
+			}
+
 		}
 
 	}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-multi-webserver",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "A multi http server manager",
   "main": "lib/main.js",
   "scripts": {

diff --git a/tests/tests.js b/tests/tests.js
@@ -190,6 +190,15 @@ describe("create one http server", () => {
 
 			});
 
+		}).then(() => {
+
+			return servers.listen((req, res) => {
+
+				res.writeHead(200, {"Content-Type": contentType});
+				res.end(message);
+
+			});
+
 		}).then(() => {
 
 			assert.strictEqual(1, servers.servers.length, "server number is incorrect");