Replace hardcoded version with ldflag usage

diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go
index 8e66938a76131fb8b31539b0dd2ad7c0177d3a78..66566cdabe1de9f0f72a4dbe85f948e300988b3d 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -122,6 +122,12 @@ func main() {
                }(srv)
        }
 
                }(srv)
        }
 

+       slogger.Info("Hotline server started",
+               "version", version,
+               "API port", fmt.Sprintf("%s:%v", *netInterface, *basePort),
+               "Transfer port", fmt.Sprintf("%s:%v", *netInterface, *basePort+1),
+       )
+

        // Serve Hotline requests until program exit
        log.Fatal(srv.ListenAndServe(ctx, cancel))
 }
        // Serve Hotline requests until program exit
        log.Fatal(srv.ListenAndServe(ctx, cancel))
 }

diff --git a/hotline/server.go b/hotline/server.go
index b4841a7beef26c3ef4ac0d86caa3eb8de43e4243..ff8daf3fb3ccaff5f882c77bca28ae3f5399ee3c 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -92,12 +92,6 @@ type PrivateChat struct {
 }
 
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {
 }
 
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {

-       s.Logger.Info("Hotline server started",
-               "version", VERSION,
-               "API port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port),
-               "Transfer port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port+1),
-       )
-

        var wg sync.WaitGroup
 
        wg.Add(1)
        var wg sync.WaitGroup
 
        wg.Add(1)

diff --git a/hotline/version.go b/hotline/version.go
deleted file mode 100644 (file)
index 3d7e9af..0000000
--- a/hotline/version.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package hotline
-
-const VERSION = "0.12.3"