fix: crash in case of failure to bind (fix #25)

muety · Jan 7, 2021 · 94fe864 · 94fe864
1 parent ac9137e
commit 94fe864
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -4,7 +4,8 @@ CMD_ARGS="-token $APP_TOKEN \
     -address 0.0.0.0 \
     -dataDir /srv/data \
     -mode $APP_MODE \
-    -rateLimit $APP_RATE_LIMIT"
+    -rateLimit $APP_RATE_LIMIT \
+    -disableIPv6"
 
 if [[ "$APP_TOKEN" == "" ]]; then
   echo "Token missing. Please provide one."

diff --git a/main.go b/main.go
@@ -98,19 +98,35 @@ func listen() {
 
 	if botConfig.UseHTTPS {
 		fmt.Printf("Listening for HTTPS on %s.\n", s.Addr)
-		go s.ListenAndServeTLS(botConfig.CertPath, botConfig.KeyPath)
+		go func() {
+			if err := s.ListenAndServeTLS(botConfig.CertPath, botConfig.KeyPath); err != nil {
+				log.Fatalln(err)
+			}
+		}()
 
 		if s6 != nil {
 			fmt.Printf("Listening for HTTPS on %s.\n", s6.Addr)
-			go s6.ListenAndServeTLS(botConfig.CertPath, botConfig.KeyPath)
+			go func() {
+				if err := s6.ListenAndServeTLS(botConfig.CertPath, botConfig.KeyPath); err != nil {
+					log.Fatalln(err)
+				}
+			}()
 		}
 	} else {
 		fmt.Printf("Listening for HTTP on %s.\n", s.Addr)
-		go s.ListenAndServe()
+		go func() {
+			if err := s.ListenAndServe(); err != nil {
+				log.Fatalln(err)
+			}
+		}()
 
 		if s6 != nil {
 			fmt.Printf("Listening for HTTP on %s.\n", s6.Addr)
-			go s6.ListenAndServe()
+			go func() {
+				if err := s6.ListenAndServe(); err != nil {
+					log.Fatalln(err)
+				}
+			}()
 		}
 	}
 }

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.2.2
+2.2.3