Merge pull request #468 from Darkren/fix/vpn-server-exit-on-failure

Make app exit on VPN server failure
skycoin · Aug 14, 2020 · fb01f5c · fb01f5c
2 parents c7ae857 + 4789cfe
commit fb01f5c
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/cmd/apps/vpn-server/vpn-server.go b/cmd/apps/vpn-server/vpn-server.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"os"
 	"os/signal"
+	"runtime"
 	"syscall"
 
 	"github.com/sirupsen/logrus"
@@ -32,6 +33,10 @@ var (
 )
 
 func main() {
+	if runtime.GOOS != "linux" {
+		log.Fatalln("OS is not supported")
+	}
+
 	flag.Parse()
 
 	localPK := cipher.PubKey{}
@@ -78,11 +83,19 @@ func main() {
 			log.WithError(err).Errorln("Error closing server")
 		}
 	}()
+
+	errCh := make(chan error)
 	go func() {
 		if err := srv.Serve(l); err != nil {
-			log.WithError(err).Errorln("Error serving")
+			errCh <- err
 		}
+
+		close(errCh)
 	}()
 
-	<-osSigs
+	select {
+	case <-osSigs:
+	case err := <-errCh:
+		log.WithError(err).Errorln("Error serving")
+	}
 }