Browse Source

auto update script executed

Toby Chui 1 year ago
parent
commit
101bce84f1
2 changed files with 9 additions and 11 deletions
  1. 8 10
      mod/dynamicproxy/dynamicproxy.go
  2. 1 1
      reverseproxy.go

+ 8 - 10
mod/dynamicproxy/dynamicproxy.go

@@ -171,10 +171,7 @@ func (router *Router) StartProxyService() error {
 				<-stopChan
 				ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 				defer cancel()
-				err := httpServer.Shutdown(ctx)
-				if err != nil {
-					log.Println(err)
-				}
+				httpServer.Shutdown(ctx)
 				log.Println("HTTP to HTTPS redirection listener stopped")
 			}()
 
@@ -247,12 +244,13 @@ func (router *Router) Restart() error {
 		if err != nil {
 			return err
 		}
-	}
-	time.Sleep(300 * time.Millisecond)
-	// Start the server
-	err = router.StartProxyService()
-	if err != nil {
-		return err
+
+		time.Sleep(300 * time.Millisecond)
+		// Start the server
+		err = router.StartProxyService()
+		if err != nil {
+			return err
+		}
 	}
 
 	return err

+ 1 - 1
reverseproxy.go

@@ -738,7 +738,7 @@ func HandleUpdatePort80Listener(w http.ResponseWriter, r *http.Request) {
 		} else if enabled == "false" {
 			sysdb.Write("settings", "listenP80", false)
 			SystemWideLogger.Println("Disabling port 80 listener")
-			dynamicProxyRouter.UpdatePort80ListenerState(true)
+			dynamicProxyRouter.UpdatePort80ListenerState(false)
 		} else {
 			utils.SendErrorResponse(w, "invalid mode given: "+enabled)
 		}