From 618a23627d66d50668ffa1bed853b908faa29526 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Tue, 5 Oct 2021 19:12:20 +0200 Subject: [PATCH] flag for journallog --- go.mod | 2 ++ go.sum | 3 +++ main.go | 25 +++++++++++++++---------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 3864627..15b5e6b 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/markus-wa/demoinfocs-golang/v2 v2.10.1 github.com/mattn/go-sqlite3 v1.14.8 github.com/sirupsen/logrus v1.2.0 + github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3 go.uber.org/ratelimit v0.2.0 google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c @@ -18,6 +19,7 @@ require ( require ( github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect + github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect github.com/felixge/httpsnoop v1.0.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect diff --git a/go.sum b/go.sum index 23eca7e..245b075 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,7 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -250,6 +251,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3 h1:shC1HB1UogxN5Ech3Yqaaxj1X/P656PPCB4RbojIJqc= +github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3/go.mod h1:XCsSkdKK4gwBMNrOCZWww0pX6AOt+2gYc5Z6jBRrNVg= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/main.go b/main.go index 8b0ce05..4c9958f 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,7 @@ import ( "github.com/gorilla/mux" _ "github.com/mattn/go-sqlite3" log "github.com/sirupsen/logrus" + "github.com/wercker/journalhook" "go.uber.org/ratelimit" "gopkg.in/yaml.v3" "net" @@ -28,16 +29,17 @@ import ( ) var ( - conf = utils.Conf{} - demoLoader = &csgo.DemoMatchLoader{} - router *mux.Router - db *utils.DBWithLock - sendGC chan *csgo.Demo - demoParser = &csgo.DemoParser{} - firstHK = true - rL ratelimit.Limiter - configFlag = flag.String("config", "config.yaml", "Set config to use") - authCodeFlag = flag.String("authcode", "", "Provide Steam AuthCode to login") + conf = utils.Conf{} + demoLoader = &csgo.DemoMatchLoader{} + router *mux.Router + db *utils.DBWithLock + sendGC chan *csgo.Demo + demoParser = &csgo.DemoParser{} + firstHK = true + rL ratelimit.Limiter + configFlag = flag.String("config", "config.yaml", "Set config to use") + authCodeFlag = flag.String("authcode", "", "Provide Steam AuthCode to login") + journalLogFlag = flag.Bool("journal", false, "Log to systemd journal instead of stdout") ) type PlayerResponse struct { @@ -371,6 +373,9 @@ func main() { lvl, err := log.ParseLevel(conf.Logging.Level) utils.Check(err) log.SetLevel(lvl) + if *journalLogFlag { + journalhook.Enable() + } db = &utils.DBWithLock{ Lock: new(sync.RWMutex),