logger if not production mod

axetroy · May 21, 2020 · 293f3ac · 293f3ac
1 parent 5da72f0
commit 293f3ac
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/internal/app/admin_server/router.go b/internal/app/admin_server/router.go
@@ -17,9 +17,11 @@ import (
 	"github.com/axetroy/go-server/internal/app/admin_server/controller/role"
 	"github.com/axetroy/go-server/internal/app/admin_server/controller/system"
 	"github.com/axetroy/go-server/internal/app/admin_server/controller/user"
+	"github.com/axetroy/go-server/internal/library/config"
 	"github.com/axetroy/go-server/internal/library/router"
 	"github.com/axetroy/go-server/internal/middleware"
 	"github.com/kataras/iris/v12"
+	"github.com/kataras/iris/v12/middleware/logger"
 	"github.com/kataras/iris/v12/middleware/recover"
 	"net/http"
 )
@@ -45,6 +47,10 @@ func init() {
 		v1.Use(middleware.Common())
 		v1.Use(middleware.CORS())
 
+		if config.Common.Mode == "production" {
+			v1.Use(logger.New())
+		}
+
 		{
 			v1.Get("", router.Handler(func(c router.Context) {
 				c.JSON(nil, map[string]string{"ping": "tong"}, nil)

diff --git a/internal/app/resource_server/router.go b/internal/app/resource_server/router.go
@@ -7,9 +7,11 @@ import (
 	"github.com/axetroy/go-server/internal/app/resource_server/controller/downloader"
 	"github.com/axetroy/go-server/internal/app/resource_server/controller/resource"
 	"github.com/axetroy/go-server/internal/app/resource_server/controller/uploader"
+	"github.com/axetroy/go-server/internal/library/config"
 	"github.com/axetroy/go-server/internal/library/router"
 	"github.com/axetroy/go-server/internal/middleware"
 	"github.com/kataras/iris/v12"
+	"github.com/kataras/iris/v12/middleware/logger"
 	"github.com/kataras/iris/v12/middleware/recover"
 	"net/http"
 )
@@ -34,6 +36,10 @@ func init() {
 		v1.Use(middleware.Common())
 		v1.Use(middleware.CORS())
 
+		if config.Common.Mode == "production" {
+			v1.Use(logger.New())
+		}
+
 		{
 			v1.Get("", router.Handler(func(c router.Context) {
 				c.JSON(nil, map[string]string{"ping": "tong"}, nil)

diff --git a/internal/app/user_server/router.go b/internal/app/user_server/router.go
@@ -20,10 +20,12 @@ import (
 	"github.com/axetroy/go-server/internal/app/user_server/controller/transfer"
 	"github.com/axetroy/go-server/internal/app/user_server/controller/user"
 	"github.com/axetroy/go-server/internal/app/user_server/controller/wallet"
+	"github.com/axetroy/go-server/internal/library/config"
 	"github.com/axetroy/go-server/internal/library/router"
 	"github.com/axetroy/go-server/internal/middleware"
 	"github.com/axetroy/go-server/internal/rbac/accession"
 	"github.com/kataras/iris/v12"
+	"github.com/kataras/iris/v12/middleware/logger"
 	"github.com/kataras/iris/v12/middleware/recover"
 	"net/http"
 )
@@ -48,6 +50,10 @@ func init() {
 		v1.Use(middleware.Common())
 		v1.Use(middleware.CORS())
 
+		if config.Common.Mode == "production" {
+			v1.Use(logger.New())
+		}
+
 		{
 			v1.Get("", router.Handler(func(c router.Context) {
 				c.JSON(nil, map[string]string{"ping": "tong"}, nil)

diff --git a/internal/library/config/common.go b/internal/library/config/common.go
@@ -5,10 +5,6 @@ import (
 	"github.com/axetroy/go-server/internal/service/dotenv"
 )
 
-var (
-	ModeProduction = "production"
-)
-
 type common struct {
 	MachineId string `json:"machine_id"` // 机器 ID
 	Mode      string `json:"mode"`       // 运行模式, 开发模式还是生产模式
@@ -20,7 +16,7 @@ var Common *common
 
 func init() {
 	Common = &common{}
-	Common.Mode = dotenv.GetByDefault("GO_MOD", ModeProduction)
+	Common.Mode = dotenv.GetByDefault("GO_MOD", "production")
 	Common.MachineId = dotenv.GetByDefault("MACHINE_ID", "0")
 	Common.Signature = dotenv.GetByDefault("SIGNATURE_KEY", "signature key")
 }