修改trojan日志等级接口

Jrohy · Apr 12, 2020 · c47f8c0 · c47f8c0
1 parent 0258b48
commit c47f8c0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/web/controller/trojan.go b/web/controller/trojan.go
@@ -35,19 +35,6 @@ func Restart() *ResponseBody {
 	return &responseBody
 }
 
-// Status trojan状态
-func Status() *ResponseBody {
-	responseBody := ResponseBody{Msg: "success"}
-	defer TimeCost(time.Now(), &responseBody)
-	config := core.Load("")
-	responseBody.Data = map[string]interface{}{
-		"status":   trojan.Status(false),
-		"version":  trojan.Version(),
-		"loglevel": config.LogLevel,
-	}
-	return &responseBody
-}
-
 // Update trojan更新
 func Update() *ResponseBody {
 	responseBody := ResponseBody{Msg: "success"}
@@ -56,15 +43,26 @@ func Update() *ResponseBody {
 	return &responseBody
 }
 
-// LogLevel 修改trojan日志等级
-func LogLevel(level int) *ResponseBody {
+// SetLogLevel 修改trojan日志等级
+func SetLogLevel(level int) *ResponseBody {
 	responseBody := ResponseBody{Msg: "success"}
 	defer TimeCost(time.Now(), &responseBody)
 	core.WriteLogLevel(level)
 	trojan.Restart()
 	return &responseBody
 }
 
+// GetLogLevel 获取trojan日志等级
+func GetLogLevel() *ResponseBody {
+	responseBody := ResponseBody{Msg: "success"}
+	defer TimeCost(time.Now(), &responseBody)
+	config := core.Load("")
+	responseBody.Data = map[string]interface{}{
+		"loglevel": config.LogLevel,
+	}
+	return &responseBody
+}
+
 // Log 通过ws查看trojan实时日志
 func Log(c *gin.Context) {
 	var (

diff --git a/web/web.go b/web/web.go
@@ -53,16 +53,16 @@ func trojanRouter(router *gin.Engine) {
 	router.POST("/trojan/restart", func(c *gin.Context) {
 		c.JSON(200, controller.Restart())
 	})
-	router.GET("/trojan/status", func(c *gin.Context) {
-		c.JSON(200, controller.Status())
+	router.GET("/trojan/loglevel", func(c *gin.Context) {
+		c.JSON(200, controller.GetLogLevel())
 	})
 	router.POST("/trojan/update", func(c *gin.Context) {
 		c.JSON(200, controller.Update())
 	})
 	router.POST("/trojan/loglevel", func(c *gin.Context) {
 		slevel := c.DefaultPostForm("level", "1")
 		level, _ := strconv.Atoi(slevel)
-		c.JSON(200, controller.LogLevel(level))
+		c.JSON(200, controller.SetLogLevel(level))
 	})
 	router.GET("/trojan/log", func(c *gin.Context) {
 		controller.Log(c)