From 31a1a331f7a6ddf390aea9b1c636dbbecae49569 Mon Sep 17 00:00:00 2001 From: hexxa Date: Sat, 5 Dec 2020 10:35:07 +0800 Subject: [PATCH] fix(args): change arg prodmode name --- src/server/config.go | 4 ++-- src/server/quickshare.db | Bin 32768 -> 32768 bytes src/server/server.go | 3 ++- src/server/server_files_test.go | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/server/config.go b/src/server/config.go index 0bf74df..e0a179d 100644 --- a/src/server/config.go +++ b/src/server/config.go @@ -11,7 +11,7 @@ type Secrets struct { } type ServerCfg struct { - ProdMode bool `json:"prodMode"` + Debug bool `json:"debug"` Addr string `json:"addr"` ReadTimeout int `json:"readTimeout"` WriteTimeout int `json:"writeTimeout"` @@ -39,7 +39,7 @@ func NewDefaultConfig() *Config { TokenSecret: "", }, Server: &ServerCfg{ - ProdMode: true, + Debug: false, Addr: "127.0.0.1:8888", ReadTimeout: 2000, WriteTimeout: 2000, diff --git a/src/server/quickshare.db b/src/server/quickshare.db index 23e620353d0829ae2bfb674cb29c51cb5abcee40..ff17c5ce72da980768ac88b2756fa2c930f7c778 100644 GIT binary patch delta 99 zcmZo@U}|V!nqV;5KtMpig@pkO9#8086L@{uvCWDO8~7&)7)%68Iz#2A97xc~ll>qB nkyD7-9AmJAf06-^Rshlt0+R&-I5tZ-{NSG~-~eO#-FhEY delta 99 zcmZo@U}|V!nqV;5KtMp?4l@H7Nc*4m`E;K3?Pf)X4g8Y?3?>34??UA^DeMy0uRhWS nkyD7-9AmJAf06-^Rshlt0+R&-I5tZ-{NSG~-~eO#=?5RD diff --git a/src/server/server.go b/src/server/server.go index e880912..641794b 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -9,6 +9,7 @@ import ( "github.com/gin-gonic/gin" "github.com/ihexxa/gocfg" + "github.com/ihexxa/quickshare/src/cryptoutil/jwt" "github.com/ihexxa/quickshare/src/depidx" "github.com/ihexxa/quickshare/src/fs" @@ -30,7 +31,7 @@ type Server struct { func NewServer(cfg gocfg.ICfg) (*Server, error) { deps := initDeps(cfg) - if cfg.BoolOr("Server.ProdMode", true) { + if cfg.BoolOr("Server.Debug", false) { gin.SetMode(gin.ReleaseMode) } diff --git a/src/server/server_files_test.go b/src/server/server_files_test.go index c964135..077d5b8 100644 --- a/src/server/server_files_test.go +++ b/src/server/server_files_test.go @@ -10,6 +10,7 @@ import ( "time" "github.com/ihexxa/gocfg" + "github.com/ihexxa/quickshare/src/client" "github.com/ihexxa/quickshare/src/handlers/fileshdr" ) @@ -36,7 +37,7 @@ func TestFileHandlers(t *testing.T) { chunkSize := 2 config := `{ "Server": { - "ProdMode": false + "Debug": true }, "FS": { "Root": "./testData"