371a06403a
Net **-650 LOC** by removing duplication and dead noise. All tests pass.
### Duplication & helpers
- Extracted shared slim helpers (`UserLogin`, `UserLogins`, `LabelNames`, `BodyWithAttachments`, `UserDetail`, `Repo`/`Repos`, `Label`/`Labels`) into `pkg/slim`. Deleted the 4 copies that lived in `issue/`, `pull/`, `search/`, `repo/` (plus duplicate `slimUserDetail`/`slimRepo`/`slimLabels` across packages).
- Added `params.GetOptionalBoolPtr` and `params.GetOptionalStringPtr`. Replaced 18 awkward `new(localVar); if !ok { = nil }` patterns across `repo/`, `pull/`, `issue/`, `label/`, `milestone/`, `search/`.
- Extracted `pullRequestReviewerFn` for the 99%-identical `createPullRequestReviewerFn`/`deletePullRequestReviewerFn` pair.
### Dead code & noise
- Deleted **122** `log.Debugf("Called X")` narration lines (`zap.AddCaller` already records the caller) and pruned 19 unused `log` imports.
- Removed the unused `log.Logger` wrapper; the mcp-go server now uses `log.Default().Sugar()` directly (matches `util.Logger`).
- Deleted dead `s.DeleteTools("")` — confirmed no-op in mcp-go.
- Stripped WHAT-narration comments per project guidance.
### Correctness & consistency
- Fixed `log.Errorf(err.Error())` format-string bug in `pkg/to/to.go` — a `%` in the error would have been interpreted as a directive.
- Standardized `to.TextResult`/`to.ErrorResult` usage; `release.go`, `tag.go`, `branch.go` were bypassing the helpers in 9 sites (skipping the wrapper's debug/error logging).
- Made `params.GetString` reject empty strings; dropped 21 redundant `err != nil || x == ""` checks in `operation/actions/`.
- Replaced raw `args["org"].(string)` in `ListOrgReposFn` with `params.GetString` to match the rest of the codebase.
### Performance
- **Cached `*gitea.Client` by host+token via `sync.Map`** + shared `*http.Transport` via `sync.Once` for both SDK and raw REST paths. Eliminates the SDK's `/api/v1/version` preflight on every tool call and enables connection keep-alive across requests.
- Gated `to.TextResult` debug log behind `flag.Debug` to skip the `string(bytes)` allocation when debug is off.
- Hoisted `8192` and `60s` magic numbers in `pkg/gitea/rest.go` into named constants.
---
This PR was written with the help of Claude Opus 4.7
---------
Co-authored-by: silverwind <silv3rwind@gmail.com>
Reviewed-on: https://gitea.com/gitea/gitea-mcp/pulls/195
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-committed-by: silverwind <me@silverwind.io>
121 lines
2.3 KiB
Go
121 lines
2.3 KiB
Go
package log
|
|
|
|
import (
|
|
"os"
|
|
"sync"
|
|
"time"
|
|
|
|
"gitea.com/gitea/gitea-mcp/pkg/flag"
|
|
|
|
"go.uber.org/zap"
|
|
"go.uber.org/zap/zapcore"
|
|
"gopkg.in/natefinch/lumberjack.v2"
|
|
)
|
|
|
|
var (
|
|
defaultLoggerOnce sync.Once
|
|
defaultLogger *zap.Logger
|
|
)
|
|
|
|
func Default() *zap.Logger {
|
|
defaultLoggerOnce.Do(func() {
|
|
if defaultLogger != nil {
|
|
return
|
|
}
|
|
|
|
ec := zap.NewProductionEncoderConfig()
|
|
ec.EncodeTime = zapcore.TimeEncoderOfLayout(time.DateTime)
|
|
ec.EncodeLevel = zapcore.CapitalLevelEncoder
|
|
|
|
var ws zapcore.WriteSyncer
|
|
var wss []zapcore.WriteSyncer
|
|
|
|
home, _ := os.UserHomeDir()
|
|
if home == "" {
|
|
home = os.TempDir()
|
|
}
|
|
|
|
logDir := home + "/.gitea-mcp"
|
|
if err := os.MkdirAll(logDir, 0o700); err != nil {
|
|
// Fallback to temp directory if creation fails
|
|
logDir = os.TempDir()
|
|
}
|
|
|
|
wss = append(wss, zapcore.AddSync(&lumberjack.Logger{
|
|
Filename: logDir + "/gitea-mcp.log",
|
|
MaxSize: 100,
|
|
MaxBackups: 10,
|
|
MaxAge: 30,
|
|
}))
|
|
|
|
if flag.Mode == "http" {
|
|
wss = append(wss, zapcore.AddSync(os.Stdout))
|
|
}
|
|
|
|
ws = zapcore.NewMultiWriteSyncer(wss...)
|
|
|
|
enc := zapcore.NewConsoleEncoder(ec)
|
|
var level zapcore.Level
|
|
if flag.Debug {
|
|
level = zapcore.DebugLevel
|
|
} else {
|
|
level = zapcore.InfoLevel
|
|
}
|
|
core := zapcore.NewCore(enc, ws, level)
|
|
options := []zap.Option{
|
|
zap.AddStacktrace(zapcore.DPanicLevel),
|
|
zap.AddCaller(),
|
|
zap.AddCallerSkip(1),
|
|
}
|
|
defaultLogger = zap.New(core, options...)
|
|
})
|
|
|
|
return defaultLogger
|
|
}
|
|
|
|
func SetDefault(logger *zap.Logger) {
|
|
if logger != nil {
|
|
defaultLogger = logger
|
|
}
|
|
}
|
|
|
|
func Debug(msg string, fields ...zap.Field) {
|
|
Default().Debug(msg, fields...)
|
|
}
|
|
|
|
func Info(msg string, fields ...zap.Field) {
|
|
Default().Info(msg, fields...)
|
|
}
|
|
|
|
func Warn(msg string, fields ...zap.Field) {
|
|
Default().Warn(msg, fields...)
|
|
}
|
|
|
|
func Error(msg string, fields ...zap.Field) {
|
|
Default().Error(msg, fields...)
|
|
}
|
|
|
|
func Panic(msg string, fields ...zap.Field) {
|
|
Default().Panic(msg, fields...)
|
|
}
|
|
|
|
func Debugf(format string, args ...any) {
|
|
Default().Sugar().Debugf(format, args...)
|
|
}
|
|
|
|
func Infof(format string, args ...any) {
|
|
Default().Sugar().Infof(format, args...)
|
|
}
|
|
|
|
func Warnf(format string, args ...any) {
|
|
Default().Sugar().Warnf(format, args...)
|
|
}
|
|
|
|
func Errorf(format string, args ...any) {
|
|
Default().Sugar().Errorf(format, args...)
|
|
}
|
|
|
|
func Fatalf(format string, args ...any) {
|
|
Default().Sugar().Fatalf(format, args...)
|
|
}
|