不替换默认logger
Some checks failed
代码更新通知 / update-server (push) Failing after 1s

This commit is contained in:
2024-12-18 16:18:52 +08:00
parent 0e8b02a9b1
commit cafd7dd5bb

20
main.go
View File

@@ -19,6 +19,10 @@ import (
"time" "time"
) )
var (
logger *slog.Logger
)
func init() { func init() {
slogOpts := &slog.HandlerOptions{ slogOpts := &slog.HandlerOptions{
AddSource: false, AddSource: false,
@@ -32,17 +36,17 @@ func init() {
TimeFormat: "[15:04:05]", TimeFormat: "[15:04:05]",
StringerFormatter: true, StringerFormatter: true,
} }
logger := slog.New(devslog.NewHandler(os.Stdout, opts)) logger = slog.New(devslog.NewHandler(os.Stdout, opts))
slog.SetDefault(logger) //slog.SetDefault(logger)
} }
func main() { func main() {
if err := doPush(); err != nil { if err := doPush(); err != nil {
slog.Error("推送失败", slog.Any("err", err)) logger.Error("推送失败", slog.Any("err", err))
log.Fatalln(err) log.Fatalln(err)
} }
slog.Info("推送成功") logger.Info("推送成功")
githubactions.SetOutput("time", time.Now().Format("2006-01-02 15:04:05")) githubactions.SetOutput("time", time.Now().Format("2006-01-02 15:04:05"))
} }
@@ -51,7 +55,7 @@ func doPush() error {
ctx, err := githubactions.Context() ctx, err := githubactions.Context()
if err != nil { if err != nil {
slog.Error("获取上下文失败", slog.Any("err", err)) logger.Error("获取上下文失败", slog.Any("err", err))
return err return err
} }
@@ -107,7 +111,7 @@ func pushMessage(parsedURL *url.URL, token string, msg *models.MessageExternal)
params.SetBody(msg) params.SetBody(msg)
res, err := client.Message.CreateMessage(params, auth.TokenAuth(token)) res, err := client.Message.CreateMessage(params, auth.TokenAuth(token))
if err == nil { if err == nil {
slog.Info("推送结果", slog.Any("result", res)) logger.Info("推送结果", slog.Any("result", res))
return nil return nil
} else { } else {
return err return err
@@ -117,12 +121,12 @@ func pushMessage(parsedURL *url.URL, token string, msg *models.MessageExternal)
func getExtraMsg(ctx *githubactions.GitHubContext) (result string) { func getExtraMsg(ctx *githubactions.GitHubContext) (result string) {
body, err := os.ReadFile(ctx.EventPath) body, err := os.ReadFile(ctx.EventPath)
if err != nil { if err != nil {
slog.Error("读取文件失败", slog.Any("err", err), slog.String("path", ctx.EventPath)) logger.Error("读取文件失败", slog.Any("err", err), slog.String("path", ctx.EventPath))
return return
} }
event := new(Event) event := new(Event)
if err = json.Unmarshal(body, &event); err != nil { if err = json.Unmarshal(body, &event); err != nil {
slog.Error("解析json失败", slog.Any("err", err), slog.String("path", ctx.EventPath), slog.String("body", string(body))) logger.Error("解析json失败", slog.Any("err", err), slog.String("path", ctx.EventPath), slog.String("body", string(body)))
return return
} }