集成日志打印

phpdragon · phpdragon · commit c4cec1ec578d · 2020-03-26T17:53:54.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-.idea
+.idea
+*.log
diff --git a/gateway_proxy.go b/gateway_proxy.go
@@ -4,6 +4,7 @@ import (
 	"./consts"
 	ctl "./controllers"
 	"./core"
+	logger "./core/log"
 	eureka "./eureka-client"
 	"./logic"
 	"./utils"
@@ -20,7 +21,7 @@ import (
 )
 
 var (
-	gFaviconIco,_ = ioutil.ReadFile("favicon.ico")
+	gFaviconIco, _ = ioutil.ReadFile("favicon.ico")
 	//	g_mqaddr = flag.String("mqaddr", "amqp://root:root1234@127.0.0.1:5672/", "mq server addr")
 	gMySQLConnect = flag.String("mysqlUrl", "root:root1234@tcp(127.0.0.1:3306)/db_gateway_proxy?charset=utf8", "myssql host")
 	//	g_redisaddr    = flag.String("redisaddr", "127.0.0.1:6379", "redis mq server addr")
@@ -106,12 +107,12 @@ func writeJsonResponse(rw http.ResponseWriter, req *http.Request, response inter
 		rw.Header().Set(consts.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true")
 	}
 
-	var err interface{}
+	var err error
 	var dataBody []byte
 	if isJson {
 		dataBody, err = utils.ToJSONStringByte(response)
 		if err != nil {
-			log.Println(err)
+			logger.Info(err.Error())
 			rw.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -121,7 +122,7 @@ func writeJsonResponse(rw http.ResponseWriter, req *http.Request, response inter
 
 	_, err = rw.Write(dataBody)
 	if err != nil {
-		log.Println(err)
+		logger.Info(err.Error())
 		rw.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -159,6 +160,9 @@ func main() {
 	}) // start client, register、heartbeat、refresh
 	client.Start()
 
+	//监听日志级别设置
+	http.HandleFunc("/handle/level", logger.GetAtomicLevel().ServeHTTP)
+
 	// http server
 	http.HandleFunc(statusPageURL, func(writer http.ResponseWriter, request *http.Request) {
 		writeJsonResponse(writer, request, ctl.ActuatorStatus(port, appName), true)
@@ -169,7 +173,7 @@ func main() {
 	http.HandleFunc("/favicon.ico", func(writer http.ResponseWriter, request *http.Request) {
 		_, err := writer.Write(gFaviconIco)
 		if err != nil {
-			log.Println(err)
+			logger.Info(err.Error())
 			writer.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -190,7 +194,7 @@ func main() {
 func indexHandler(rw http.ResponseWriter, req *http.Request, client *eureka.EurekaClient) {
 	response, err := logic.HandleHttpRequest(req, client)
 	if nil != err {
-		log.Println(err)
+		logger.Info(err.Error())
 		response = core.BuildFail(core.SYSTEM_ERROR, err.Error())
 	}
 
diff --git a/logic/HttpReqLogic.go b/logic/HttpReqLogic.go
@@ -3,14 +3,13 @@ package logic
 import (
 	"../consts"
 	"../core"
+	log "../core/log"
 	eureka "../eureka-client"
 	"../models"
 	"../utils"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"strings"
 )
@@ -25,7 +24,7 @@ func HandleHttpRequest(req *http.Request, client *eureka.EurekaClient) (interfac
 
 	routeMap, err := models.QueryAllActiveRoutes()
 	if nil != err {
-		log.Println(err)
+		log.Info(err.Error())
 		return nil, err
 	}
 	if nil == routeMap {
@@ -34,7 +33,7 @@ func HandleHttpRequest(req *http.Request, client *eureka.EurekaClient) (interfac
 
 	route, ok := routeMap[req.URL.Path]
 	if !ok {
-		log.Println(err)
+		log.Info(err.Error())
 		return nil, errors.New("请开发人员配置转发设置")
 	}
 
@@ -58,10 +57,12 @@ func callRemoteService(httpUrl string, req []byte) (interface{}, error) {
 func getPostParams(rw http.ResponseWriter, req *http.Request) (core.ApiRequest, error) {
 	body, err := ioutil.ReadAll(req.Body)
 	if nil != err {
+		log.Info(err.Error())
 		return core.ApiRequest{}, err
 	}
 	err = req.Body.Close()
 	if nil != err {
+		log.Info(err.Error())
 		return core.ApiRequest{}, err
 	}
 
@@ -73,7 +74,7 @@ func getPostParams(rw http.ResponseWriter, req *http.Request) (core.ApiRequest,
 		err := json.Unmarshal([]byte(body), &requestData)
 		//解析失败会报错，如json字符串格式不对，缺"号，缺}等。
 		if err != nil {
-			fmt.Println(err)
+			log.Info(err.Error())
 			return requestData, nil
 		}
 	} else if strings.Contains(contentType, consts.APPLICATION_X_WWW_FORM_URLENCODED) {
diff --git a/utils/HttpUtil.go b/utils/HttpUtil.go
@@ -13,9 +13,9 @@ func HttpPostByte(url string, postData []byte) ([]byte, error) {
 	request.Header.Set("Connection", "keep-alive")
 	request.Header.Set("Content-type", "application/json;charset=UTF-8")
 	request.Header.Set("user-agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36")
-	response, error := client.Do(request)
-	if error != nil || response.StatusCode != 200 {
-		return nil, error
+	response, err := client.Do(request)
+	if err != nil || response.StatusCode != 200 {
+		return nil, err
 	}
 
 	return ioutil.ReadAll(response.Body)
@@ -28,28 +28,28 @@ func HttpPost(url string, postData string) (string, error) {
 	request.Header.Set("Connection", "keep-alive")
 	request.Header.Set("Content-type", "application/json;charset=UTF-8")
 	request.Header.Set("user-agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36")
-	response, error := client.Do(request)
-	if error != nil || response.StatusCode != 200 {
+	response, err := client.Do(request)
+	if err != nil || response.StatusCode != 200 {
 		return "", nil
 	}
 
-	body, error := ioutil.ReadAll(response.Body)
-	return string(body), error
+	body, err := ioutil.ReadAll(response.Body)
+	return string(body), err
 }
 
 func HttpGet(url string) (string, error) {
 	// 提交get请求
 	client := &http.Client{}
 	request, _ := http.NewRequest("GET", url, nil)
 	request.Header.Set("Connection", "keep-alive")
-	response, error := client.Do(request)
-	if error != nil || response.StatusCode != 200 {
+	response, err := client.Do(request)
+	if err != nil || response.StatusCode != 200 {
 		return "", nil
 	}
 
-	body, error := ioutil.ReadAll(response.Body)
-	if error != nil || response.StatusCode != 200 {
-		return "", error
+	body, err := ioutil.ReadAll(response.Body)
+	if err != nil || response.StatusCode != 200 {
+		return "", err
 	}
-	return string(body), error
+	return string(body), err
 }
diff --git a/utils/SimpleUtil.go b/utils/SimpleUtil.go
@@ -1,9 +1,9 @@
 package utils
 
 import (
+	log "../core/log"
 	"bytes"
 	"encoding/json"
-	"log"
 	"os"
 	"regexp"
 )
@@ -13,7 +13,7 @@ func dumJsonStr(jsonStr string) {
 	err := json.Indent(&out, []byte(jsonStr), "", "\t")
 
 	if err != nil {
-		log.Fatalln(err)
+		log.Info(err.Error())
 	}
 
 	_, _ = out.WriteTo(os.Stdout)
@@ -23,7 +23,7 @@ func jsonStr2Map(jsonStr string) (map[string]interface{}, error) {
 	var mapResult map[string]interface{}
 	//使用 json.Unmarshal(data []byte, v interface{})进行转换,返回 error 信息
 	if err := json.Unmarshal([]byte(jsonStr), &mapResult); err != nil {
-		log.Fatal(err)
+		log.Info(err.Error())
 		return nil, err
 	}
 
diff --git a/utils/SpringUtil.go b/utils/SpringUtil.go
@@ -1,15 +1,14 @@
 package utils
 
 import (
+	log "../core/log"
 	"encoding/json"
-	"fmt"
-	"log"
 )
 
 func ToJSONString(v interface{}) (string, error) {
 	jsonStr, err := json.Marshal(v)
 	if err != nil {
-		log.Fatal("Resp Json Err:", fmt.Sprint(err))
+		log.Info("解析失败:" + err.Error())
 		return "", nil
 	}
 
@@ -19,7 +18,7 @@ func ToJSONString(v interface{}) (string, error) {
 func ToJSONStringByte(v interface{}) ([]byte, error) {
 	jsonStr, err := json.Marshal(v)
 	if err != nil {
-		log.Fatal("Resp Json Err:", fmt.Sprint(err))
+		log.Info("解析失败:" + err.Error())
 		return nil, nil
 	}
 	return jsonStr, nil
@@ -29,7 +28,7 @@ func ToJSON(jsonStr string, v interface{}) (interface{}, error) {
 	err := json.Unmarshal([]byte(jsonStr), &v)
 	//解析失败会报错，如json字符串格式不对，缺"号，缺}等。
 	if err != nil {
-		fmt.Println(err)
+		log.Info("解析失败:" + err.Error())
 		return nil, err
 	}
 	return v, nil
