From af168311006f0e4e30800c0f2ae3d65921233822 Mon Sep 17 00:00:00 2001 From: William Clark Date: Mon, 5 Dec 2022 14:25:48 +0000 Subject: [PATCH] custom port --- config.toml | 15 +++++++++++---- main.go | 2 +- web/gin.go | 8 ++++++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config.toml b/config.toml index 4ed7514..f627ebf 100644 --- a/config.toml +++ b/config.toml @@ -1,19 +1,26 @@ [TH7] -port = 8080 +port = 9090 logfreq = 60 [DB] type = "sqlite3" path = "test.db" -[Channel_1] -type = 'J' - [Channel_2] type = 'N' +unit = 'C' [Channel_3] type = 'T' +unit = 'C' [Channel_4] type = 'K' +unit = 'C' + +[Channel_6] +type = 'J' +unit = 'C' +offset = -23.1 + + diff --git a/main.go b/main.go index 85a2d6e..02ff44b 100644 --- a/main.go +++ b/main.go @@ -53,7 +53,7 @@ func main() { } defer dbPort.Close() - webPort = web.NewGinAdapter(corePort) + webPort = web.NewGinAdapter(corePort, config.Board.Port) go webPort.Run() sig := <-kill diff --git a/web/gin.go b/web/gin.go index 3704575..26b1041 100644 --- a/web/gin.go +++ b/web/gin.go @@ -1,6 +1,7 @@ package web import ( + "fmt" "net/http" "strconv" @@ -12,6 +13,7 @@ import ( type GinAdapter struct { router *gin.Engine corePort ports.CorePort + port int } func (g GinAdapter) registerEndpoints() { @@ -49,10 +51,11 @@ func (g GinAdapter) registerEndpoints() { } -func NewGinAdapter(corePort ports.CorePort) *GinAdapter { +func NewGinAdapter(corePort ports.CorePort, port int) *GinAdapter { var adapter GinAdapter adapter.corePort = corePort + adapter.port = port adapter.router = gin.Default() adapter.registerEndpoints() @@ -61,5 +64,6 @@ func NewGinAdapter(corePort ports.CorePort) *GinAdapter { } func (g *GinAdapter) Run() { - g.router.Run() + portStr := fmt.Sprintf(":%d", g.port) + g.router.Run(portStr) }