Skip to content

Commit 9e21e8f

Browse files
committed
Build & version log
1 parent f8c3836 commit 9e21e8f

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ adnl-tu*
44
*.json
55
tunnel-node
66
*.log
7-
*.png
7+
*.png
8+
build

Makefile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
.PHONY: binary library
1+
.PHONY: all build
22

3-
binary:
4-
go build -o tunnel-node cmd/node/main.go
3+
ver := $(shell git describe --tags --always --dirty)
54

6-
library:
7-
go build -o libtunnel.a -buildmode=c-archive cmd/lib/lib.go
5+
build:
6+
go build -ldflags "-w -s -X main.GitCommit=$(ver)" -o build/tunnel-node cmd/node/main.go
7+
8+
all:
9+
GOOS=linux GOARCH=amd64 go build -ldflags "-w -s -X main.GitCommit=$(ver)" -o build/tunnel-node-linux-amd64 cmd/node/main.go
10+
GOOS=linux GOARCH=arm64 go build -ldflags "-w -s -X main.GitCommit=$(ver)" -o build/tunnel-node-linux-arm64 cmd/node/main.go
11+
GOOS=darwin GOARCH=arm64 go build -ldflags "-w -s -X main.GitCommit=$(ver)" -o build/tunnel-node-mac-arm64 cmd/node/main.go
12+
GOOS=darwin GOARCH=amd64 go build -ldflags "-w -s -X main.GitCommit=$(ver)" -o build/tunnel-node-mac-amd64 cmd/node/main.go
13+
GOOS=windows GOARCH=amd64 go build -ldflags "-w -s -X main.GitCommit=$(ver)" -o build/tunnel-node-x64.exe cmd/node/main.go

cmd/node/main.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ var MetricsAddr = flag.String("metrics-listen-addr", "", "Addr to run the promet
5555
var LogCompress = flag.Bool("log-compress", false, "whether to compress rotated log files")
5656
var LogDisableFile = flag.Bool("log-disable-file", false, "Disable logging to file")
5757

58+
var GitCommit = "dev"
59+
5860
func main() {
5961
flag.Parse()
6062

@@ -75,13 +77,15 @@ func main() {
7577
log.Logger = zerolog.New(multi).With().Timestamp().Logger().Level(zerolog.InfoLevel)
7678
adnl.Logger = func(v ...any) {}
7779

80+
log.Info().Str("version", GitCommit).Msg("starting tunnel node...")
81+
7882
if *Verbosity >= 5 {
7983
dht.Logger = func(v ...any) {
8084
log.Logger.Debug().Msg(fmt.Sprintln(v...))
8185
}
8286
}
8387

84-
if *Verbosity >= 4 {
88+
if *Verbosity >= 6 {
8589
adnl.Logger = func(v ...any) {
8690
log.Logger.Debug().Msg(fmt.Sprintln(v...))
8791
}

0 commit comments

Comments
 (0)