fix: remove SetVersionInfo call that overwrote ldflag-injected version
The web.Version/web.Commit were being reset to 'dev' at runtime because SetVersionInfo was called with the (unused) local vars. Now ldflags-injected values are used directly without override. Version bump: 0.2.0 -> 0.2.1
This commit is contained in:
+1
-7
@@ -17,11 +17,6 @@ import (
|
|||||||
"github.com/darroyo/nasctl/internal/web"
|
"github.com/darroyo/nasctl/internal/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
|
||||||
version = "dev"
|
|
||||||
commit = ""
|
|
||||||
)
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
addr := flag.String("addr", envOrDefault("NASCTL_ADDR", ":8080"), "HTTP listen address")
|
addr := flag.String("addr", envOrDefault("NASCTL_ADDR", ":8080"), "HTTP listen address")
|
||||||
dbPath := flag.String("db", envOrDefault("NASCTL_DB", "/var/lib/nasctl/nasctl.db"), "SQLite database path")
|
dbPath := flag.String("db", envOrDefault("NASCTL_DB", "/var/lib/nasctl/nasctl.db"), "SQLite database path")
|
||||||
@@ -84,7 +79,6 @@ func main() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
eng := engine.New(sambaModule, nfsModule, usersModule)
|
eng := engine.New(sambaModule, nfsModule, usersModule)
|
||||||
web.SetVersionInfo(version, commit)
|
|
||||||
srv := web.NewServer(database, eng, web.Options{
|
srv := web.NewServer(database, eng, web.Options{
|
||||||
AllowedRoots: parseRoots(*allowedRoots),
|
AllowedRoots: parseRoots(*allowedRoots),
|
||||||
Auth: auth,
|
Auth: auth,
|
||||||
@@ -92,7 +86,7 @@ func main() {
|
|||||||
ExportsPath: *exportsPath,
|
ExportsPath: *exportsPath,
|
||||||
})
|
})
|
||||||
|
|
||||||
log.Printf("nasctl %s (commit %s) listening on %s (db=%s exec-system=%v)", version, commit, *addr, *dbPath, *execSystem)
|
log.Printf("nasctl %s (commit %s) listening on %s (db=%s exec-system=%v)", web.Version, web.Commit, *addr, *dbPath, *execSystem)
|
||||||
if err := http.ListenAndServe(*addr, srv.Handler()); err != nil {
|
if err := http.ListenAndServe(*addr, srv.Handler()); err != nil {
|
||||||
log.Fatalf("server error: %v", err)
|
log.Fatalf("server error: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user