mirror of
https://github.com/TeaOSLab/EdgeNode.git
synced 2025-11-18 11:40:24 +08:00
调整个别日志级别
This commit is contained in:
@@ -202,11 +202,11 @@ func (this *HTTPRequest) doFastcgi() (shouldStop bool) {
|
|||||||
|
|
||||||
err1 := resp.Body.Close()
|
err1 := resp.Body.Close()
|
||||||
if err1 != nil {
|
if err1 != nil {
|
||||||
remotelogs.Error("REQUEST_REVERSE_PROXY", err1.Error())
|
remotelogs.Warn("REQUEST_FASTCGI", err1.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil && err != io.EOF {
|
if err != nil && err != io.EOF {
|
||||||
remotelogs.Error("REQUEST_REVERSE_PROXY", err.Error())
|
remotelogs.Warn("REQUEST_FASTCGI", err.Error())
|
||||||
this.addError(err)
|
this.addError(err)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ func (this *HTTPRequest) doReverseProxy() {
|
|||||||
if this.doWAFResponse(resp) {
|
if this.doWAFResponse(resp) {
|
||||||
err = resp.Body.Close()
|
err = resp.Body.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
remotelogs.Error("REQUEST_REVERSE_PROXY", err.Error())
|
remotelogs.Warn("REQUEST_REVERSE_PROXY", err.Error())
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -201,7 +201,7 @@ func (this *HTTPRequest) doReverseProxy() {
|
|||||||
if len(this.web.Pages) > 0 && this.doPage(resp.StatusCode) {
|
if len(this.web.Pages) > 0 && this.doPage(resp.StatusCode) {
|
||||||
err = resp.Body.Close()
|
err = resp.Body.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
remotelogs.Error("REQUEST_REVERSE_PROXY", err.Error())
|
remotelogs.Warn("REQUEST_REVERSE_PROXY", err.Error())
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -257,13 +257,13 @@ func (this *HTTPRequest) doReverseProxy() {
|
|||||||
err1 := resp.Body.Close()
|
err1 := resp.Body.Close()
|
||||||
if err1 != nil {
|
if err1 != nil {
|
||||||
if !this.canIgnore(err) {
|
if !this.canIgnore(err) {
|
||||||
remotelogs.Error("REQUEST_REVERSE_PROXY", err1.Error())
|
remotelogs.Warn("REQUEST_REVERSE_PROXY", err1.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil && err != io.EOF {
|
if err != nil && err != io.EOF {
|
||||||
if !this.canIgnore(err) {
|
if !this.canIgnore(err) {
|
||||||
remotelogs.Error("REQUEST_REVERSE_PROXY", err.Error())
|
remotelogs.Warn("REQUEST_REVERSE_PROXY", err.Error())
|
||||||
this.addError(err)
|
this.addError(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,21 +12,21 @@ import (
|
|||||||
|
|
||||||
var sharedListenerManager = NewListenerManager()
|
var sharedListenerManager = NewListenerManager()
|
||||||
|
|
||||||
// 端口监听管理器
|
// ListenerManager 端口监听管理器
|
||||||
type ListenerManager struct {
|
type ListenerManager struct {
|
||||||
listenersMap map[string]*Listener // addr => *Listener
|
listenersMap map[string]*Listener // addr => *Listener
|
||||||
locker sync.Mutex
|
locker sync.Mutex
|
||||||
lastConfig *nodeconfigs.NodeConfig
|
lastConfig *nodeconfigs.NodeConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取新对象
|
// NewListenerManager 获取新对象
|
||||||
func NewListenerManager() *ListenerManager {
|
func NewListenerManager() *ListenerManager {
|
||||||
return &ListenerManager{
|
return &ListenerManager{
|
||||||
listenersMap: map[string]*Listener{},
|
listenersMap: map[string]*Listener{},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 启动监听
|
// Start 启动监听
|
||||||
func (this *ListenerManager) Start(node *nodeconfigs.NodeConfig) error {
|
func (this *ListenerManager) Start(node *nodeconfigs.NodeConfig) error {
|
||||||
this.locker.Lock()
|
this.locker.Lock()
|
||||||
defer this.locker.Unlock()
|
defer this.locker.Unlock()
|
||||||
@@ -83,7 +83,13 @@ func (this *ListenerManager) Start(node *nodeconfigs.NodeConfig) error {
|
|||||||
listener.Reload(group)
|
listener.Reload(group)
|
||||||
err := listener.Listen()
|
err := listener.Listen()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
remotelogs.Error("LISTENER_MANAGER", err.Error())
|
firstServer := group.FirstServer()
|
||||||
|
if firstServer == nil {
|
||||||
|
remotelogs.Error("LISTENER_MANAGER", err.Error())
|
||||||
|
} else {
|
||||||
|
remotelogs.ServerError(firstServer.Id, "LISTENER_MANAGER", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
this.listenersMap[addr] = listener
|
this.listenersMap[addr] = listener
|
||||||
@@ -93,7 +99,7 @@ func (this *ListenerManager) Start(node *nodeconfigs.NodeConfig) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取总的活跃连接数
|
// TotalActiveConnections 获取总的活跃连接数
|
||||||
func (this *ListenerManager) TotalActiveConnections() int {
|
func (this *ListenerManager) TotalActiveConnections() int {
|
||||||
this.locker.Lock()
|
this.locker.Lock()
|
||||||
defer this.locker.Unlock()
|
defer this.locker.Unlock()
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ func init() {
|
|||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
// 打印普通信息
|
// Println 打印普通信息
|
||||||
func Println(tag string, description string) {
|
func Println(tag string, description string) {
|
||||||
logs.Println("[" + tag + "]" + description)
|
logs.Println("[" + tag + "]" + description)
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ func Println(tag string, description string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 打印警告信息
|
// Warn 打印警告信息
|
||||||
func Warn(tag string, description string) {
|
func Warn(tag string, description string) {
|
||||||
logs.Println("[" + tag + "]" + description)
|
logs.Println("[" + tag + "]" + description)
|
||||||
|
|
||||||
@@ -70,7 +70,7 @@ func Warn(tag string, description string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 打印错误信息
|
// Error 打印错误信息
|
||||||
func Error(tag string, description string) {
|
func Error(tag string, description string) {
|
||||||
logs.Println("[" + tag + "]" + description)
|
logs.Println("[" + tag + "]" + description)
|
||||||
|
|
||||||
@@ -93,6 +93,30 @@ func Error(tag string, description string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ServerError 打印错误信息
|
||||||
|
func ServerError(serverId int64, tag string, description string) {
|
||||||
|
logs.Println("[" + tag + "]" + description)
|
||||||
|
|
||||||
|
nodeConfig, _ := nodeconfigs.SharedNodeConfig()
|
||||||
|
if nodeConfig == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case logChan <- &pb.NodeLog{
|
||||||
|
Role: teaconst.Role,
|
||||||
|
Tag: tag,
|
||||||
|
Description: description,
|
||||||
|
Level: "error",
|
||||||
|
NodeId: nodeConfig.Id,
|
||||||
|
ServerId: serverId,
|
||||||
|
CreatedAt: time.Now().Unix(),
|
||||||
|
}:
|
||||||
|
default:
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 上传日志
|
// 上传日志
|
||||||
func uploadLogs() error {
|
func uploadLogs() error {
|
||||||
logList := []*pb.NodeLog{}
|
logList := []*pb.NodeLog{}
|
||||||
|
|||||||
Reference in New Issue
Block a user