From cafd7dd5bb114a1e8f4d64d7a0a5fdfaa370a918 Mon Sep 17 00:00:00 2001 From: fghwett <1058178245@qq.com> Date: Wed, 18 Dec 2024 16:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=9B=BF=E6=8D=A2=E9=BB=98=E8=AE=A4lo?= =?UTF-8?q?gger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index a9c8ef9..94eb365 100644 --- a/main.go +++ b/main.go @@ -19,6 +19,10 @@ import ( "time" ) +var ( + logger *slog.Logger +) + func init() { slogOpts := &slog.HandlerOptions{ AddSource: false, @@ -32,17 +36,17 @@ func init() { TimeFormat: "[15:04:05]", 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() { if err := doPush(); err != nil { - slog.Error("推送失败", slog.Any("err", err)) + logger.Error("推送失败", slog.Any("err", err)) log.Fatalln(err) } - slog.Info("推送成功") + logger.Info("推送成功") githubactions.SetOutput("time", time.Now().Format("2006-01-02 15:04:05")) } @@ -51,7 +55,7 @@ func doPush() error { ctx, err := githubactions.Context() if err != nil { - slog.Error("获取上下文失败", slog.Any("err", err)) + logger.Error("获取上下文失败", slog.Any("err", err)) return err } @@ -107,7 +111,7 @@ func pushMessage(parsedURL *url.URL, token string, msg *models.MessageExternal) params.SetBody(msg) res, err := client.Message.CreateMessage(params, auth.TokenAuth(token)) if err == nil { - slog.Info("推送结果", slog.Any("result", res)) + logger.Info("推送结果", slog.Any("result", res)) return nil } else { return err @@ -117,12 +121,12 @@ func pushMessage(parsedURL *url.URL, token string, msg *models.MessageExternal) func getExtraMsg(ctx *githubactions.GitHubContext) (result string) { body, err := os.ReadFile(ctx.EventPath) 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 } event := new(Event) 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 }