From 7b68bbf84a0203fedca4813559fa81e990313fd2 Mon Sep 17 00:00:00 2001 From: HynoR <20227709+HynoR@users.noreply.github.com> Date: Thu, 9 Nov 2023 16:43:14 +0800 Subject: [PATCH 1/3] Improve log output --- app/cmd/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/cmd/server.go b/app/cmd/server.go index 2679271..0a64602 100644 --- a/app/cmd/server.go +++ b/app/cmd/server.go @@ -729,7 +729,7 @@ func runServer(cmd *cobra.Command, args []string) { if err != nil { logger.Fatal("failed to initialize server", zap.Error(err)) } - logger.Info("server up and running") + logger.Info("hysteria server up and running", zap.String("listen", config.Listen)) if !disableUpdateCheck { go runCheckUpdateServer() From a1bd044467105d596e29049a902c906e9dc7c802 Mon Sep 17 00:00:00 2001 From: HynoR <20227709+HynoR@users.noreply.github.com> Date: Thu, 9 Nov 2023 16:57:21 +0800 Subject: [PATCH 2/3] Improve log output --- app/cmd/server.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/cmd/server.go b/app/cmd/server.go index 0a64602..5cccb6d 100644 --- a/app/cmd/server.go +++ b/app/cmd/server.go @@ -729,8 +729,11 @@ func runServer(cmd *cobra.Command, args []string) { if err != nil { logger.Fatal("failed to initialize server", zap.Error(err)) } - logger.Info("hysteria server up and running", zap.String("listen", config.Listen)) - + if config.Listen == "" { + logger.Info("hysteria server up and running on default address", zap.String("listen", ":443")) + } else { + logger.Info("hysteria server up and running", zap.String("listen", config.Listen)) + } if !disableUpdateCheck { go runCheckUpdateServer() } From 6872bb0263eed5bfb9e787856361ebcdba848e94 Mon Sep 17 00:00:00 2001 From: Toby Date: Fri, 10 Nov 2023 17:16:34 -0800 Subject: [PATCH 3/3] improve code --- app/cmd/server.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/cmd/server.go b/app/cmd/server.go index 5cccb6d..385849f 100644 --- a/app/cmd/server.go +++ b/app/cmd/server.go @@ -29,6 +29,10 @@ import ( "github.com/apernet/hysteria/extras/trafficlogger" ) +const ( + defaultListenAddr = ":443" +) + var serverCmd = &cobra.Command{ Use: "server", Short: "Server mode", @@ -208,7 +212,7 @@ type serverConfigMasquerade struct { func (c *serverConfig) fillConn(hyConfig *server.Config) error { listenAddr := c.Listen if listenAddr == "" { - listenAddr = ":443" + listenAddr = defaultListenAddr } uAddr, err := net.ResolveUDPAddr("udp", listenAddr) if err != nil { @@ -729,11 +733,12 @@ func runServer(cmd *cobra.Command, args []string) { if err != nil { logger.Fatal("failed to initialize server", zap.Error(err)) } - if config.Listen == "" { - logger.Info("hysteria server up and running on default address", zap.String("listen", ":443")) + if config.Listen != "" { + logger.Info("server up and running", zap.String("listen", config.Listen)) } else { - logger.Info("hysteria server up and running", zap.String("listen", config.Listen)) + logger.Info("server up and running", zap.String("listen", defaultListenAddr)) } + if !disableUpdateCheck { go runCheckUpdateServer() }