Updated for Net 2.1. Wait a second for each initial launch to catch s…

…tartup errors
PerfectlySoft · Dec 4, 2016 · be4f958 · be4f958
1 parent df41175
commit be4f958
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Sources/PerfectHTTPServer/HTTPServer.swift b/Sources/PerfectHTTPServer/HTTPServer.swift
@@ -152,7 +152,7 @@ public class HTTPServer {
 	public func start() throws {
 		if let (cert, key) = ssl {
 			let socket = NetTCPSSL()
-			socket.initSocket()
+			try socket.bind(port: serverPort, address: serverAddress)
 			socket.cipherList = self.cipherList
 
 			if let verifyMode = certVerifyMode,
@@ -181,7 +181,7 @@ public class HTTPServer {
 			Log.info(message: "Starting HTTPS server \(serverName) on \(serverAddress):\(serverPort)")
 		} else {
 			self.net = NetTCP()
-			self.net?.initSocket()
+			try self.net?.bind(port: serverPort, address: serverAddress)
 			Log.info(message: "Starting HTTP server \(serverName) on \(serverAddress):\(serverPort)")
 		}
 		try self.startInner()
@@ -197,7 +197,6 @@ public class HTTPServer {
 		guard let sock = self.net else {
 			Log.terminal(message: "Server could not be started. Socket was not initialized.")
 		}
-		try sock.bind(port: serverPort, address: serverAddress)
 		if let runAs = self.runAsUser {
 			try PerfectServer.switchTo(userName: runAs)
 		}

diff --git a/Sources/PerfectHTTPServer/HTTPServerEx.swift b/Sources/PerfectHTTPServer/HTTPServerEx.swift
@@ -238,6 +238,7 @@ public extension HTTPServer {
 		let ctx = servers.map { LaunchContext($0) }
 		try ctx.forEach { try $0.launchServer() }
 		if wait {
+			try ctx.forEach { try $0.wait(seconds: 1.0) }
 			try ctx.forEach { try $0.wait() }
 		}
 		return ctx
@@ -255,6 +256,7 @@ public extension HTTPServer {
 		let lc = LaunchContext(.server(name: name, port: port, routes: routes, runAs: runAs, requestFilters: requestFilters, responseFilters: responseFilters))
 		try lc.launchServer()
 		if wait {
+			try lc.wait(seconds: 1.0)
 			try lc.wait()
 		}
 		return lc
@@ -274,6 +276,7 @@ public extension HTTPServer {
 		let lc = LaunchContext(.server(name: name, port: port, documentRoot: root, runAs: runAs, requestFilters: requestFilters, responseFilters: responseFilters))
 		try lc.launchServer()
 		if wait {
+			try lc.wait(seconds: 1.0)
 			try lc.wait()
 		}
 		return lc