Skip to content

Commit e7da1f4

Browse files
committed
feat(logger): 清理代码:移除不必要的调试日志
- 删除了`base.go`和`heartbeat.go`文件中的多个调试日志调用,以简化代码并提高可读性。 - 保留了核心逻辑,确保功能正常运行。
1 parent 7b87880 commit e7da1f4

2 files changed

Lines changed: 0 additions & 18 deletions

File tree

relay/base.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package relay
22

33
import (
44
"encoding/json"
5-
"one-api/common/logger"
65
"one-api/model"
76
"one-api/relay/relay_util"
87
"one-api/types"
@@ -135,19 +134,16 @@ func (r *relayBase) HandleStreamError(err *types.OpenAIErrorWithStatusCode) {
135134

136135
func (r *relayBase) SetHeartbeat(isStream bool) *relay_util.Heartbeat {
137136
if !r.allowHeartbeat {
138-
logger.LogDebug(r.c.Request.Context(), "SetHeartbeat: allowHeartbeat is false")
139137
return nil
140138
}
141139

142140
setting, exists := r.c.Get("token_setting")
143141
if !exists {
144-
logger.LogDebug(r.c.Request.Context(), "SetHeartbeat: token_setting not found")
145142
return nil
146143
}
147144

148145
tokenSetting, ok := setting.(*model.TokenSetting)
149146
if !ok || !tokenSetting.Heartbeat.Enabled {
150-
logger.LogDebug(r.c.Request.Context(), "SetHeartbeat: token_setting.Heartbeat.Enabled is false")
151147
return nil
152148
}
153149

relay/relay_util/heartbeat.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ package relay_util
22

33
import (
44
"context"
5-
"fmt"
65
"net/http"
7-
"one-api/common/logger"
86
"one-api/common/requester"
97
"sync/atomic"
108
"time"
@@ -81,10 +79,8 @@ func (h *Heartbeat) writeHeader() bool {
8179

8280
// Start 启动心跳机制,在指定的超时时间后开始发送心跳
8381
func (h *Heartbeat) Start() {
84-
logger.LogDebug(h.c.Request.Context(), "Start")
8582
// 如果已停止,不允许启动
8683
if atomic.LoadInt32(&h.stopped) == 1 {
87-
logger.LogDebug(h.c.Request.Context(), "Start: stopped")
8884
return
8985
}
9086

@@ -99,13 +95,11 @@ func (h *Heartbeat) Start() {
9995
case <-timer.C:
10096
// 检查是否已停止
10197
if atomic.LoadInt32(&h.stopped) == 1 {
102-
logger.LogDebug(h.c.Request.Context(), "Start: stopped 2")
10398
return
10499
}
105100

106101
// 写入头部
107102
if !h.writeHeader() {
108-
logger.LogDebug(h.c.Request.Context(), "Start: writeHeader failed")
109103
return
110104
}
111105

@@ -116,18 +110,15 @@ func (h *Heartbeat) Start() {
116110
for {
117111
select {
118112
case <-h.ctx.Done():
119-
logger.LogDebug(h.c.Request.Context(), "Start: ctx.Done")
120113
// 心跳被取消
121114
return
122115
case <-h.c.Request.Context().Done():
123116
// 客户端已断开
124-
logger.LogDebug(h.c.Request.Context(), "Start: c.Request.Context().Done")
125117
h.Stop() // 确保停止
126118
return
127119
case <-ticker.C:
128120
// 检查是否已停止
129121
if atomic.LoadInt32(&h.stopped) == 1 {
130-
logger.LogDebug(h.c.Request.Context(), "Start: stopped 3")
131122
return
132123
}
133124

@@ -140,19 +131,16 @@ func (h *Heartbeat) Start() {
140131
}
141132
if err != nil {
142133
// 发生错误,停止心跳
143-
logger.LogDebug(h.c.Request.Context(), fmt.Sprintf("Start: Write failed: %v", err))
144134
h.Stop()
145135
return
146136
}
147137
h.c.Writer.Flush()
148138
}
149139
}
150140
case <-h.ctx.Done():
151-
logger.LogDebug(h.c.Request.Context(), "Start: ctx.Done 2")
152141
return
153142
case <-h.c.Request.Context().Done():
154143
// 客户端已断开
155-
logger.LogDebug(h.c.Request.Context(), "Start: c.Request.Context().Done 2")
156144
h.Stop()
157145
return
158146
}
@@ -180,10 +168,8 @@ func (h *Heartbeat) IsSafeWriteStream() bool {
180168
h.Stop()
181169

182170
if h.isStream {
183-
logger.LogDebug(h.c.Request.Context(), "IsSafeWriteStream: isStream")
184171
return h.HasWrittenHeader()
185172
}
186173

187-
logger.LogDebug(h.c.Request.Context(), "IsSafeWriteStream: false")
188174
return false
189175
}

0 commit comments

Comments
 (0)