From b94aa5e9aa939c26f4c64b94b0a3fc3a77ed9960 Mon Sep 17 00:00:00 2001 From: usbharu Date: Fri, 25 Apr 2025 10:13:23 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0?= =?UTF-8?q?=E3=81=A7=E3=83=AD=E3=82=B0=E3=83=AC=E3=83=99=E3=83=AB=E3=81=A8?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index 219ab4f..d36dea7 100644 --- a/main.go +++ b/main.go @@ -1,13 +1,13 @@ package main import ( - "fmt" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" "github.com/yitsushi/go-misskey" "net/http" "os" + "strings" ) //TIP

To run your code, right-click the code and select Run.

Alternatively, click @@ -20,6 +20,8 @@ var endpoint = os.Getenv("MISSKEY_ENDPOINT") var protocol, hasProtocolEnv = os.LookupEnv("MISSKEY_PROTOCOL") var path = os.Getenv("MISSKEY_PATH") var apiKey = os.Getenv("MISSKEY_API_TOKEN") +var logLevelEnv = os.Getenv("LOGGER_LEVEL") +var logFormatEnv = os.Getenv("LOGGER_FORMAT") var ( misskeyJobQueueJobsCount = prometheus.NewGaugeVec( @@ -177,19 +179,39 @@ func main() { options, err := misskey.NewClientWithOptions( misskey.WithAPIToken(apiKey), misskey.WithBaseURL(protocol, endpoint, path), - misskey.WithLogLevel(logrus.InfoLevel), ) + var logLevel logrus.Level + switch { + case strings.EqualFold("DEBUG", logLevelEnv): + logLevel = logrus.DebugLevel + break + case strings.EqualFold("INFO", logLevelEnv): + logLevel = logrus.InfoLevel + break + case strings.EqualFold("WARN", logLevelEnv): + logLevel = logrus.WarnLevel + break + case strings.EqualFold("ERROR", logLevelEnv): + logLevel = logrus.ErrorLevel + break + case strings.EqualFold("FATAL", logLevelEnv): + logLevel = logrus.FatalLevel + break + case strings.EqualFold("TRACE", logLevelEnv): + logLevel = logrus.TraceLevel + break + default: + logLevel = logrus.InfoLevel + } + if strings.EqualFold("json", logFormatEnv) { + logrus.SetFormatter(&logrus.JSONFormatter{}) + } + logrus.SetLevel(logLevel) client = options if err != nil { logrus.Error(err) return } - stats, err := client.Admin().Queue().Stats() - if err != nil { - logrus.Error(err) - return - } - fmt.Println(stats) prometheus.MustRegister(misskeyJobQueueJobsCount) prometheus.MustRegister(misskeyJobQueueDelayed)