Merge pull request #317 from oliveroneill/server-start-bug

damian-kolakowski · web-flow · commit b33295680aea · 2018-06-07T10:31:15.000+02:00
Fix bug where server may fail to start
diff --git a/Sources/HttpServerIO.swift b/Sources/HttpServerIO.swift
@@ -75,6 +75,7 @@ public class HttpServerIO {
         self.state = .starting
         let address = forceIPv4 ? listenAddressIPv4 : listenAddressIPv6
         self.socket = try Socket.tcpSocketForListen(port, forceIPv4, SOMAXCONN, address)
+        self.state = .running
         DispatchQueue.global(qos: priority).async { [weak self] in
             guard let strongSelf = self else { return }
             guard strongSelf.operating else { return }
@@ -93,7 +94,6 @@ public class HttpServerIO {
             }
             strongSelf.stop()
         }
-        self.state = .running
     }
 
     public func stop() {

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ public class HttpServerIO {`
`75`	`75`	`self.state = .starting`
`76`	`76`	`let address = forceIPv4 ? listenAddressIPv4 : listenAddressIPv6`
`77`	`77`	`self.socket = try Socket.tcpSocketForListen(port, forceIPv4, SOMAXCONN, address)`
	`78`	`+ self.state = .running`
`78`	`79`	`DispatchQueue.global(qos: priority).async { [weak self] in`
`79`	`80`	`guard let strongSelf = self else { return }`
`80`	`81`	`guard strongSelf.operating else { return }`
`@@ -93,7 +94,6 @@ public class HttpServerIO {`
`93`	`94`	`}`
`94`	`95`	`strongSelf.stop()`
`95`	`96`	`}`
`96`		`- self.state = .running`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public func stop() {`