Merge pull request getlantern#2841 from getlantern/issue-2840

Stopping Lantern when port 8787 is not available. Closes #2840
randomNone1 · Jul 29, 2015 · 1cee1a4 · 1cee1a4
2 parents b1d6ba6 + c0a06d1
commit 1cee1a4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/github.com/getlantern/flashlight/flashlight.go b/src/github.com/getlantern/flashlight/flashlight.go
@@ -253,9 +253,9 @@ func runClientProxy(cfg *config.Config) {
 	watchDirectAddrs()
 
 	go func() {
-		addExitFunc(pacOff)
 		err := client.ListenAndServe(func() {
 			pacOn()
+			addExitFunc(pacOff)
 			if showui && !*startup {
 				// Launch a browser window with Lantern but only after the pac
 				// URL and the proxy server are all up and running to avoid
@@ -267,7 +267,7 @@ func runClientProxy(cfg *config.Config) {
 			}
 		})
 		if err != nil {
-			log.Errorf("Error calling listen and serve: %v", err)
+			exit(fmt.Errorf("Error calling listen and serve: %v", err))
 		}
 	}()
 }