diff --git a/.golangci.yml b/.golangci.yml
index a8a3b45e3..b117af924 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -24,3 +24,8 @@ linters:
- nilerr
- revive
- wastedassign
+
+linters-settings:
+ govet:
+ disable:
+ - composites
\ No newline at end of file
diff --git a/README.md b/README.md
index b5ca41aa7..c0107eaac 100644
--- a/README.md
+++ b/README.md
@@ -217,6 +217,7 @@ The following libraries and frameworks are used by GoToSocial, with gratitude
- [go-playground/validator](https://github.com/go-playground/validator); struct validation. [MIT License](https://spdx.org/licenses/MIT.html)
- [gorilla/websocket](https://github.com/gorilla/websocket); Websocket connectivity. [BSD-2-Clause License](https://spdx.org/licenses/BSD-2-Clause.html).
- [gruf/go-debug](https://codeberg.org/gruf/go-debug); profiling support in debug builds. [MIT License](https://spdx.org/licenses/MIT.html).
+- [gruf/go-kv](https://codeberg.org/gruf/go-kv); key-value field formatting. [MIT License](https://spdx.org/licenses/MIT.html).
- [gruf/go-mutexes](https://codeberg.org/gruf/go-mutexes); mutex map. [MIT License](https://spdx.org/licenses/MIT.html).
- [gruf/go-runners](https://codeberg.org/gruf/go-runners); worker pool library. [MIT License](https://spdx.org/licenses/MIT.html).
- [gruf/go-store](https://codeberg.org/gruf/go-store); local media store. [MIT License](https://spdx.org/licenses/MIT.html).
@@ -235,7 +236,6 @@ The following libraries and frameworks are used by GoToSocial, with gratitude
- [ReneKroon/ttlcache](https://github.com/ReneKroon/ttlcache); in-memory caching. [MIT License](https://spdx.org/licenses/MIT.html).
- [robfig/cron](https://github.com/robfig/cron); cron job scheduling. [MIT License](https://spdx.org/licenses/MIT.html).
- [russross/blackfriday](https://github.com/russross/blackfriday); markdown parsing for statuses. [Simplified BSD License](https://spdx.org/licenses/BSD-2-Clause.html).
-- [sirupsen/logrus](https://github.com/sirupsen/logrus); logging. [MIT License](https://spdx.org/licenses/MIT.html).
- [spf13/cobra](https://github.com/spf13/cobra); command-line tooling. [Apache-2.0 License](https://spdx.org/licenses/Apache-2.0.html).
- [spf13/pflag](https://github.com/spf13/pflag); command-line flag utilities. [Apache-2.0 License](https://spdx.org/licenses/Apache-2.0.html).
- [spf13/viper](https://github.com/spf13/viper); configuration management. [Apache-2.0 License](https://spdx.org/licenses/Apache-2.0.html).
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go
index 35dc029c5..ee327c0c5 100644
--- a/cmd/gotosocial/action/server/server.go
+++ b/cmd/gotosocial/action/server/server.go
@@ -25,7 +25,6 @@ import (
"os/signal"
"syscall"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action"
"github.com/superseriousbusiness/gotosocial/internal/api"
"github.com/superseriousbusiness/gotosocial/internal/api/client/account"
@@ -59,6 +58,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb"
"github.com/superseriousbusiness/gotosocial/internal/gotosocial"
"github.com/superseriousbusiness/gotosocial/internal/httpclient"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
@@ -236,13 +236,13 @@ var Start action.GTSAction = func(ctx context.Context) error {
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, os.Interrupt, syscall.SIGTERM)
sig := <-sigs
- logrus.Infof("received signal %s, shutting down", sig)
+ log.Infof("received signal %s, shutting down", sig)
// close down all running services in order
if err := gts.Stop(ctx); err != nil {
return fmt.Errorf("error closing gotosocial service: %s", err)
}
- logrus.Info("done! exiting...")
+ log.Info("done! exiting...")
return nil
}
diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go
index b5526dc32..739358f99 100644
--- a/cmd/gotosocial/action/testrig/testrig.go
+++ b/cmd/gotosocial/action/testrig/testrig.go
@@ -28,7 +28,6 @@ import (
"os/signal"
"syscall"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action"
"github.com/superseriousbusiness/gotosocial/internal/api"
"github.com/superseriousbusiness/gotosocial/internal/api/client/account"
@@ -56,6 +55,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/api/security"
"github.com/superseriousbusiness/gotosocial/internal/concurrency"
"github.com/superseriousbusiness/gotosocial/internal/gotosocial"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/oidc"
"github.com/superseriousbusiness/gotosocial/internal/storage"
@@ -189,7 +189,7 @@ var Start action.GTSAction = func(ctx context.Context) error {
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, os.Interrupt, syscall.SIGTERM)
sig := <-sigs
- logrus.Infof("received signal %s, shutting down", sig)
+ log.Infof("received signal %s, shutting down", sig)
testrig.StandardDBTeardown(dbService)
testrig.StandardStorageTeardown(storageBackend)
@@ -199,6 +199,6 @@ var Start action.GTSAction = func(ctx context.Context) error {
return fmt.Errorf("error closing gotosocial service: %s", err)
}
- logrus.Info("done! exiting...")
+ log.Info("done! exiting...")
return nil
}
diff --git a/cmd/gotosocial/common.go b/cmd/gotosocial/common.go
index 43e2f16ad..4ebdc5485 100644
--- a/cmd/gotosocial/common.go
+++ b/cmd/gotosocial/common.go
@@ -64,8 +64,19 @@ func preRun(a preRunArgs) error {
// The idea here is to take a GTSAction and run it with the given
// context, after initializing any last-minute things like loggers etc.
func run(ctx context.Context, action action.GTSAction) error {
- if err := log.Initialize(); err != nil {
- return fmt.Errorf("error initializing log: %s", err)
+ // Set the global log level from configuration
+ if err := log.ParseLevel(config.GetLogLevel()); err != nil {
+ return fmt.Errorf("error parsing log level: %w", err)
+ }
+
+ if config.GetSyslogEnabled() {
+ // Enable logging to syslog
+ if err := log.EnableSyslog(
+ config.GetSyslogProtocol(),
+ config.GetSyslogAddress(),
+ ); err != nil {
+ return fmt.Errorf("error enabling syslogging: %w", err)
+ }
}
return action(ctx)
diff --git a/cmd/gotosocial/main.go b/cmd/gotosocial/main.go
index 1b815f6b7..6edede6d5 100644
--- a/cmd/gotosocial/main.go
+++ b/cmd/gotosocial/main.go
@@ -19,10 +19,10 @@
package main
import (
+ "log"
"runtime/debug"
"strings"
- "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
_ "github.com/superseriousbusiness/gotosocial/docs"
@@ -66,7 +66,7 @@ func main() {
// run
if err := rootCmd.Execute(); err != nil {
- logrus.Fatalf("error executing command: %s", err)
+ log.Fatalf("error executing command: %s", err)
}
}
diff --git a/go.mod b/go.mod
index e01678a25..3d963019d 100644
--- a/go.mod
+++ b/go.mod
@@ -3,11 +3,14 @@ module github.com/superseriousbusiness/gotosocial
go 1.18
require (
+ codeberg.org/gruf/go-atomics v1.1.0
codeberg.org/gruf/go-bytesize v0.2.1
codeberg.org/gruf/go-byteutil v1.0.2
codeberg.org/gruf/go-cache/v2 v2.1.1
codeberg.org/gruf/go-debug v1.2.0
codeberg.org/gruf/go-errors/v2 v2.0.2
+ codeberg.org/gruf/go-kv v1.3.2
+ codeberg.org/gruf/go-logger/v2 v2.0.6
codeberg.org/gruf/go-mutexes v1.1.2
codeberg.org/gruf/go-runners v1.2.1
codeberg.org/gruf/go-store v1.3.8
@@ -32,7 +35,6 @@ require (
github.com/oklog/ulid v1.3.1
github.com/robfig/cron/v3 v3.0.1
github.com/russross/blackfriday/v2 v2.1.0
- github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.4.0
github.com/spf13/viper v1.11.0
github.com/stretchr/testify v1.7.1
@@ -55,7 +57,6 @@ require (
)
require (
- codeberg.org/gruf/go-atomics v1.1.0 // indirect
codeberg.org/gruf/go-bitutil v1.0.1 // indirect
codeberg.org/gruf/go-bytes v1.0.2 // indirect
codeberg.org/gruf/go-fastcopy v1.1.1 // indirect
@@ -113,6 +114,7 @@ require (
github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
github.com/rs/xid v1.2.1 // indirect
+ github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
diff --git a/go.sum b/go.sum
index c6ab9451e..dda597dca 100644
--- a/go.sum
+++ b/go.sum
@@ -40,6 +40,7 @@ codeberg.org/gruf/go-atomics v1.1.0/go.mod h1:a/4/y/LgvjxjQVnpoy1VVkOSzLS1W9i1g4
codeberg.org/gruf/go-bitutil v1.0.0/go.mod h1:sb8IjlDnjVTz8zPK/8lmHesKxY0Yb3iqHWjUM/SkphA=
codeberg.org/gruf/go-bitutil v1.0.1 h1:l8z9nOvCpHhicU2LZyJ6jLK03UNzCF6bxVCwu+VEenQ=
codeberg.org/gruf/go-bitutil v1.0.1/go.mod h1:3ezHnADoiRJs9jgn65AEZ3HY7dsabAYLmmnIvseCGJI=
+codeberg.org/gruf/go-buf v1.0.0/go.mod h1:9fuVcFZsqnuXyeNFr9DtrxR4c6MIRoDE37YV7B2egD0=
codeberg.org/gruf/go-bytes v1.0.0/go.mod h1:1v/ibfaosfXSZtRdW2rWaVrDXMc9E3bsi/M9Ekx39cg=
codeberg.org/gruf/go-bytes v1.0.2 h1:malqE42Ni+h1nnYWBUAJaDDtEzF4aeN4uPN8DfMNNvo=
codeberg.org/gruf/go-bytes v1.0.2/go.mod h1:1v/ibfaosfXSZtRdW2rWaVrDXMc9E3bsi/M9Ekx39cg=
@@ -51,6 +52,7 @@ codeberg.org/gruf/go-byteutil v1.0.2/go.mod h1:cWM3tgMCroSzqoBXUXMhvxTxYJp+TbCr6
codeberg.org/gruf/go-cache v1.1.2/go.mod h1:/Dbc+xU72Op3hMn6x2PXF3NE9uIDFeS+sXPF00hN/7o=
codeberg.org/gruf/go-cache/v2 v2.1.1 h1:Ate0URlO6dVTYGxcIST9sDKtwOqrqBmlm73zy3Bq1+k=
codeberg.org/gruf/go-cache/v2 v2.1.1/go.mod h1:XstSofaENTH3PNBoMrBcowFJ339OcJfTwO0PCOp5lKQ=
+codeberg.org/gruf/go-ctx v1.0.2/go.mod h1:iMyid3m2Rr1wSWL+snliBK5qE51b4pLY5CozVUrb/QU=
codeberg.org/gruf/go-debug v1.2.0 h1:WBbTMnK1ArFKUmgv04aO2JiC/daTOB8zQGi521qb7OU=
codeberg.org/gruf/go-debug v1.2.0/go.mod h1:N+vSy9uJBQgpQcJUqjctvqFz7tBHJf+S/PIjLILzpLg=
codeberg.org/gruf/go-errors/v2 v2.0.0/go.mod h1:ZRhbdhvgoUA3Yw6e56kd9Ox984RrvbEFC2pOXyHDJP4=
@@ -63,6 +65,14 @@ codeberg.org/gruf/go-fastpath v1.0.3 h1:3Iftz9Z2suCEgTLkQMucew+2+4Oe46JPbAM2JEhn
codeberg.org/gruf/go-fastpath v1.0.3/go.mod h1:edveE/Kp3Eqi0JJm0lXYdkVrB28cNUkcb/bRGFTPqeI=
codeberg.org/gruf/go-hashenc v1.0.2 h1:U3jH6zMXZiL96czD/qaJd8OR2h7LlBzGv/2WxnMHI/g=
codeberg.org/gruf/go-hashenc v1.0.2/go.mod h1:eK+A8clLcEN/m1nftNsRId0kfYDQnETnuIfBGZ8Gvsg=
+codeberg.org/gruf/go-kv v1.2.0/go.mod h1:z2+9sJc3cWuW9vUZI5tX0Uc9DNgmDdFihsThkShUk6w=
+codeberg.org/gruf/go-kv v1.2.1/go.mod h1:nTmEd529nq8jV8jXwrr7HXR5nHRnKA9jPR0R8PX/EYw=
+codeberg.org/gruf/go-kv v1.3.2 h1:FVWQMCZfFJlzYssOQDXs/sJ8kLhcOx4CPJmdzxfe41c=
+codeberg.org/gruf/go-kv v1.3.2/go.mod h1:0I7qkI6eLpUtv940vrPasHFhMqlZojGlHf7iF2/Z86A=
+codeberg.org/gruf/go-log v1.0.4/go.mod h1:XOkZfvx78Q214dWVKuaPFqkRWJQBipsdou+LrDRlwB8=
+codeberg.org/gruf/go-logger/v2 v2.0.6 h1:uKpfwQufP76avJ326WUWI40T1qIh7UbxpPlA9UQ8zr8=
+codeberg.org/gruf/go-logger/v2 v2.0.6/go.mod h1:9kg3GVDGzBXsrv1vALNRm/NJAkPvs5P000DLzladkb0=
+codeberg.org/gruf/go-middleware v1.1.0/go.mod h1:6D5GVA+qdg/xd+FP+6RgX61mWaMlZZ2Jz6dowJs0rPI=
codeberg.org/gruf/go-mutexes v1.1.2 h1:AMC1CFV6kMi+iBjR3yQv8yIagG3lWm68U6sQHYFHEf4=
codeberg.org/gruf/go-mutexes v1.1.2/go.mod h1:1j/6/MBeBQUedAtAtysLLnBKogfOZAxdym0E3wlaBD8=
codeberg.org/gruf/go-nowish v1.0.0/go.mod h1:70nvICNcqQ9OHpF07N614Dyk7cpL5ToWU1K1ZVCec2s=
@@ -76,6 +86,7 @@ codeberg.org/gruf/go-sched v1.0.1 h1:+EAXSVI4orY5lMNX2Vrke/UxF2qjmEy6gHcyySZg/3k
codeberg.org/gruf/go-sched v1.0.1/go.mod h1:LFzosJL0yrCNtXg9Vq9iwr4q6ANuRirO2cVwKYH7CLs=
codeberg.org/gruf/go-store v1.3.8 h1:7Hzzsa8gaOc6spuGWXJVUWRAyKiOR/m60/jNYrD8cT0=
codeberg.org/gruf/go-store v1.3.8/go.mod h1:Fy5pXEHiIVFRWDx8DfILwXS1ulrj/jLdSK2C2oElz3I=
+codeberg.org/gruf/go-ulid v1.0.0/go.mod h1:dVNsZJpVTge8+jfBTjAMpnscYSiCqk+g32ZgtorCAMs=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -140,6 +151,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.5.3/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
diff --git a/internal/ap/interfaces.go b/internal/ap/interfaces.go
index 240d965ca..35ce937a1 100644
--- a/internal/ap/interfaces.go
+++ b/internal/ap/interfaces.go
@@ -261,8 +261,7 @@ type WithSensitive interface {
}
// WithConversation ...
-type WithConversation interface {
- // TODO
+type WithConversation interface { // TODO
}
// WithContent represents an activity with ActivityStreamsContentProperty
diff --git a/internal/api/client/fileserver/servefile.go b/internal/api/client/fileserver/servefile.go
index ac2fa7bc2..fffa15a1c 100644
--- a/internal/api/client/fileserver/servefile.go
+++ b/internal/api/client/fileserver/servefile.go
@@ -24,10 +24,10 @@ import (
"net/http"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/api"
"github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
)
@@ -93,7 +93,7 @@ func (m *FileServer) ServeFile(c *gin.Context) {
// if the content is a ReadCloser, close it when we're done
if closer, ok := content.Content.(io.ReadCloser); ok {
if err := closer.Close(); err != nil {
- logrus.Errorf("ServeFile: error closing readcloser: %s", err)
+ log.Errorf("ServeFile: error closing readcloser: %s", err)
}
}
}()
diff --git a/internal/api/client/fileserver/servefile_test.go b/internal/api/client/fileserver/servefile_test.go
index e918a9026..8e9cbe548 100644
--- a/internal/api/client/fileserver/servefile_test.go
+++ b/internal/api/client/fileserver/servefile_test.go
@@ -27,7 +27,6 @@ import (
"testing"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
"github.com/stretchr/testify/suite"
"github.com/superseriousbusiness/gotosocial/internal/api/client/fileserver"
"github.com/superseriousbusiness/gotosocial/internal/concurrency"
@@ -35,6 +34,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/email"
"github.com/superseriousbusiness/gotosocial/internal/federation"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
@@ -96,7 +96,7 @@ func (suite *ServeFileTestSuite) SetupSuite() {
func (suite *ServeFileTestSuite) TearDownSuite() {
if err := suite.db.Stop(context.Background()); err != nil {
- logrus.Panicf("error closing db connection: %s", err)
+ log.Panicf("error closing db connection: %s", err)
}
}
diff --git a/internal/api/client/media/mediacreate_test.go b/internal/api/client/media/mediacreate_test.go
index 935fc2970..595edb73d 100644
--- a/internal/api/client/media/mediacreate_test.go
+++ b/internal/api/client/media/mediacreate_test.go
@@ -30,7 +30,6 @@ import (
"net/http/httptest"
"testing"
- "github.com/sirupsen/logrus"
"github.com/stretchr/testify/suite"
mediamodule "github.com/superseriousbusiness/gotosocial/internal/api/client/media"
"github.com/superseriousbusiness/gotosocial/internal/api/model"
@@ -40,6 +39,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/email"
"github.com/superseriousbusiness/gotosocial/internal/federation"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
@@ -100,7 +100,7 @@ func (suite *MediaCreateTestSuite) SetupSuite() {
func (suite *MediaCreateTestSuite) TearDownSuite() {
if err := suite.db.Stop(context.Background()); err != nil {
- logrus.Panicf("error closing db connection: %s", err)
+ log.Panicf("error closing db connection: %s", err)
}
}
diff --git a/internal/api/client/media/mediaupdate_test.go b/internal/api/client/media/mediaupdate_test.go
index deb93d83c..8081a5c15 100644
--- a/internal/api/client/media/mediaupdate_test.go
+++ b/internal/api/client/media/mediaupdate_test.go
@@ -29,7 +29,6 @@ import (
"testing"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
"github.com/stretchr/testify/suite"
mediamodule "github.com/superseriousbusiness/gotosocial/internal/api/client/media"
"github.com/superseriousbusiness/gotosocial/internal/api/model"
@@ -39,6 +38,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/email"
"github.com/superseriousbusiness/gotosocial/internal/federation"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
@@ -99,7 +99,7 @@ func (suite *MediaUpdateTestSuite) SetupSuite() {
func (suite *MediaUpdateTestSuite) TearDownSuite() {
if err := suite.db.Stop(context.Background()); err != nil {
- logrus.Panicf("error closing db connection: %s", err)
+ log.Panicf("error closing db connection: %s", err)
}
}
diff --git a/internal/api/client/status/status.go b/internal/api/client/status/status.go
index abb23f1ca..67f046abd 100644
--- a/internal/api/client/status/status.go
+++ b/internal/api/client/status/status.go
@@ -22,10 +22,9 @@ import (
"net/http"
"strings"
- "github.com/sirupsen/logrus"
-
"github.com/gin-gonic/gin"
"github.com/superseriousbusiness/gotosocial/internal/api"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/processing"
"github.com/superseriousbusiness/gotosocial/internal/router"
)
@@ -105,7 +104,7 @@ func (m *Module) Route(r router.Router) error {
// muxHandler is a little workaround to overcome the limitations of Gin
func (m *Module) muxHandler(c *gin.Context) {
- logrus.Debug("entering mux handler")
+ log.Debug("entering mux handler")
ru := c.Request.RequestURI
if c.Request.Method == http.MethodGet {
diff --git a/internal/api/client/status/statusboostedby.go b/internal/api/client/status/statusboostedby.go
index 382b38f7b..fbe447bf4 100644
--- a/internal/api/client/status/statusboostedby.go
+++ b/internal/api/client/status/statusboostedby.go
@@ -21,9 +21,10 @@ package status
import (
"net/http"
+ "codeberg.org/gruf/go-kv"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/api"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
)
@@ -64,12 +65,12 @@ import (
// '404':
// description: not found
func (m *Module) StatusBoostedByGETHandler(c *gin.Context) {
- l := logrus.WithFields(logrus.Fields{
- "func": "StatusBoostedByGETHandler",
- "request_uri": c.Request.RequestURI,
- "user_agent": c.Request.UserAgent(),
- "origin_ip": c.ClientIP(),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"request_uri", c.Request.RequestURI},
+ {"user_agent", c.Request.UserAgent()},
+ {"origin_ip", c.ClientIP()},
+ }...)
l.Debugf("entering function")
authed, err := oauth.Authed(c, true, true, true, true) // we don't really need an app here but we want everything else
diff --git a/internal/api/client/streaming/stream.go b/internal/api/client/streaming/stream.go
index 2c18e4e41..7e2922acf 100644
--- a/internal/api/client/streaming/stream.go
+++ b/internal/api/client/streaming/stream.go
@@ -5,9 +5,10 @@ import (
"net/http"
"time"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/api"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
@@ -144,12 +145,12 @@ func (m *Module) StreamGETHandler(c *gin.Context) {
return
}
- l := logrus.WithFields(logrus.Fields{
- "account": account.Username,
- "path": BasePath,
- "streamID": stream.ID,
- "streamType": streamType,
- })
+ l := log.WithFields(kv.Fields{
+ {"account", account.Username},
+ {"path", BasePath},
+ {"streamID", stream.ID},
+ {"streamType", streamType},
+ }...)
wsConn, err := wsUpgrader.Upgrade(c.Writer, c.Request, nil)
if err != nil {
diff --git a/internal/api/errorhandling.go b/internal/api/errorhandling.go
index 32699fe36..346841f3f 100644
--- a/internal/api/errorhandling.go
+++ b/internal/api/errorhandling.go
@@ -22,11 +22,12 @@ import (
"context"
"net/http"
+ "codeberg.org/gruf/go-kv"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// TODO: add more templated html pages here for different error types
@@ -106,11 +107,11 @@ func ErrorHandler(c *gin.Context, errWithCode gtserror.WithCode, instanceGet fun
// to pass any detailed errors (that might contain sensitive information) into the
// errWithCode.Error() field, since the client will see this. Use your noggin!
func OAuthErrorHandler(c *gin.Context, errWithCode gtserror.WithCode) {
- l := logrus.WithFields(logrus.Fields{
- "path": c.Request.URL.Path,
- "error": errWithCode.Error(),
- "help": errWithCode.Safe(),
- })
+ l := log.WithFields(kv.Fields{
+ {"path", c.Request.URL.Path},
+ {"error", errWithCode.Error()},
+ {"help", errWithCode.Safe()},
+ }...)
statusCode := errWithCode.Code()
diff --git a/internal/api/s2s/webfinger/webfingerget.go b/internal/api/s2s/webfinger/webfingerget.go
index 6d4764ce5..68ea760bd 100644
--- a/internal/api/s2s/webfinger/webfingerget.go
+++ b/internal/api/s2s/webfinger/webfingerget.go
@@ -23,11 +23,12 @@ import (
"fmt"
"net/http"
+ "codeberg.org/gruf/go-kv"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/api"
"github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/util"
)
@@ -55,10 +56,9 @@ import (
// schema:
// "$ref": "#/definitions/wellKnownResponse"
func (m *Module) WebfingerGETRequest(c *gin.Context) {
- l := logrus.WithFields(logrus.Fields{
- "func": "WebfingerGETRequest",
- "user-agent": c.Request.UserAgent(),
- })
+ l := log.WithFields(kv.Fields{
+ {K: "user-agent", V: c.Request.UserAgent()},
+ }...)
resourceQuery, set := c.GetQuery("resource")
if !set || resourceQuery == "" {
diff --git a/internal/api/security/signaturecheck.go b/internal/api/security/signaturecheck.go
index 1dd6b5f79..1c117cd1b 100644
--- a/internal/api/security/signaturecheck.go
+++ b/internal/api/security/signaturecheck.go
@@ -4,8 +4,8 @@ import (
"net/http"
"net/url"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/ap"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/gin-gonic/gin"
"github.com/go-fed/httpsig"
@@ -15,8 +15,6 @@ import (
// that signed the request is permitted to access the server. If it is permitted, the handler will set the key
// verifier and the signature in the gin context for use down the line.
func (m *Module) SignatureCheck(c *gin.Context) {
- l := logrus.WithField("func", "DomainBlockChecker")
-
// create the verifier from the request
// if the request is signed, it will have a signature header
verifier, err := httpsig.NewVerifier(c.Request)
@@ -32,12 +30,12 @@ func (m *Module) SignatureCheck(c *gin.Context) {
// if the domain is blocked we want to bail as early as possible
blocked, err := m.db.IsURIBlocked(c.Request.Context(), requestingPublicKeyID)
if err != nil {
- l.Errorf("could not tell if domain %s was blocked or not: %s", requestingPublicKeyID.Host, err)
+ log.Errorf("could not tell if domain %s was blocked or not: %s", requestingPublicKeyID.Host, err)
c.AbortWithStatus(http.StatusInternalServerError)
return
}
if blocked {
- l.Infof("domain %s is blocked", requestingPublicKeyID.Host)
+ log.Infof("domain %s is blocked", requestingPublicKeyID.Host)
c.AbortWithStatus(http.StatusForbidden)
return
}
diff --git a/internal/api/security/tokencheck.go b/internal/api/security/tokencheck.go
index e366af2ea..0e9e7bde2 100644
--- a/internal/api/security/tokencheck.go
+++ b/internal/api/security/tokencheck.go
@@ -20,9 +20,9 @@ package security
import (
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
)
@@ -32,7 +32,6 @@ import (
// If user or account can't be found, then the handler won't *fail*, in case the server wants to allow
// public requests that don't have a Bearer token set (eg., for public instance information and so on).
func (m *Module) TokenCheck(c *gin.Context) {
- l := logrus.WithField("func", "OauthTokenMiddleware")
ctx := c.Request.Context()
defer c.Next()
@@ -43,38 +42,38 @@ func (m *Module) TokenCheck(c *gin.Context) {
ti, err := m.server.ValidationBearerToken(c.Copy().Request)
if err != nil {
- l.Infof("token was passed in Authorization header but we could not validate it: %s", err)
+ log.Infof("token was passed in Authorization header but we could not validate it: %s", err)
return
}
c.Set(oauth.SessionAuthorizedToken, ti)
// check for user-level token
if userID := ti.GetUserID(); userID != "" {
- l.Tracef("authenticated user %s with bearer token, scope is %s", userID, ti.GetScope())
+ log.Tracef("authenticated user %s with bearer token, scope is %s", userID, ti.GetScope())
// fetch user for this token
user := >smodel.User{}
if err := m.db.GetByID(ctx, userID, user); err != nil {
if err != db.ErrNoEntries {
- l.Errorf("database error looking for user with id %s: %s", userID, err)
+ log.Errorf("database error looking for user with id %s: %s", userID, err)
return
}
- l.Warnf("no user found for userID %s", userID)
+ log.Warnf("no user found for userID %s", userID)
return
}
if user.ConfirmedAt.IsZero() {
- l.Warnf("authenticated user %s has never confirmed thier email address", userID)
+ log.Warnf("authenticated user %s has never confirmed thier email address", userID)
return
}
if !user.Approved {
- l.Warnf("authenticated user %s's account was never approved by an admin", userID)
+ log.Warnf("authenticated user %s's account was never approved by an admin", userID)
return
}
if user.Disabled {
- l.Warnf("authenticated user %s's account was disabled'", userID)
+ log.Warnf("authenticated user %s's account was disabled'", userID)
return
}
@@ -84,15 +83,15 @@ func (m *Module) TokenCheck(c *gin.Context) {
acct, err := m.db.GetAccountByID(ctx, user.AccountID)
if err != nil {
if err != db.ErrNoEntries {
- l.Errorf("database error looking for account with id %s: %s", user.AccountID, err)
+ log.Errorf("database error looking for account with id %s: %s", user.AccountID, err)
return
}
- l.Warnf("no account found for userID %s", userID)
+ log.Warnf("no account found for userID %s", userID)
return
}
if !acct.SuspendedAt.IsZero() {
- l.Warnf("authenticated user %s's account (accountId=%s) has been suspended", userID, user.AccountID)
+ log.Warnf("authenticated user %s's account (accountId=%s) has been suspended", userID, user.AccountID)
return
}
@@ -101,16 +100,16 @@ func (m *Module) TokenCheck(c *gin.Context) {
// check for application token
if clientID := ti.GetClientID(); clientID != "" {
- l.Tracef("authenticated client %s with bearer token, scope is %s", clientID, ti.GetScope())
+ log.Tracef("authenticated client %s with bearer token, scope is %s", clientID, ti.GetScope())
// fetch app for this token
app := >smodel.Application{}
if err := m.db.GetWhere(ctx, []db.Where{{Key: "client_id", Value: clientID}}, app); err != nil {
if err != db.ErrNoEntries {
- l.Errorf("database error looking for application with clientID %s: %s", clientID, err)
+ log.Errorf("database error looking for application with clientID %s: %s", clientID, err)
return
}
- l.Warnf("no app found for client %s", clientID)
+ log.Warnf("no app found for client %s", clientID)
return
}
c.Set(oauth.SessionAuthorizedApplication, app)
diff --git a/internal/concurrency/workers.go b/internal/concurrency/workers.go
index 65ce9e3ab..d9669fcb3 100644
--- a/internal/concurrency/workers.go
+++ b/internal/concurrency/workers.go
@@ -27,7 +27,7 @@ import (
"runtime"
"codeberg.org/gruf/go-runners"
- "github.com/sirupsen/logrus"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// WorkerPool represents a proccessor for MsgType objects, using a worker pool to allocate resources.
@@ -63,7 +63,7 @@ func NewWorkerPool[MsgType any](workers int, queueRatio int) *WorkerPool[MsgType
}
// Log new worker creation with type prefix
- logrus.Infof("%s created with workers=%d queue=%d",
+ log.Infof("%s created with workers=%d queue=%d",
w.prefix,
workers,
workers*queueRatio,
@@ -74,7 +74,7 @@ func NewWorkerPool[MsgType any](workers int, queueRatio int) *WorkerPool[MsgType
// Start will attempt to start the underlying worker pool, or return error.
func (w *WorkerPool[MsgType]) Start() error {
- logrus.Infof("%s starting", w.prefix)
+ log.Infof("%s starting", w.prefix)
// Check processor was set
if w.process == nil {
@@ -91,7 +91,7 @@ func (w *WorkerPool[MsgType]) Start() error {
// Stop will attempt to stop the underlying worker pool, or return error.
func (w *WorkerPool[MsgType]) Stop() error {
- logrus.Infof("%s stopping", w.prefix)
+ log.Infof("%s stopping", w.prefix)
// Attempt to stop pool
if !w.workers.Stop() {
@@ -104,19 +104,19 @@ func (w *WorkerPool[MsgType]) Stop() error {
// SetProcessor will set the Worker's processor function, which is called for each queued message.
func (w *WorkerPool[MsgType]) SetProcessor(fn func(context.Context, MsgType) error) {
if w.process != nil {
- logrus.Panicf("%s Worker.process is already set", w.prefix)
+ log.Fatalf("%s Worker.process is already set", w.prefix)
}
w.process = fn
}
// Queue will queue provided message to be processed with there's a free worker.
func (w *WorkerPool[MsgType]) Queue(msg MsgType) {
- logrus.Tracef("%s queueing message (workers=%d queue=%d): %+v",
+ log.Tracef("%s queueing message (workers=%d queue=%d): %+v",
w.prefix, w.workers.Workers(), w.workers.Queue(), msg,
)
w.workers.Enqueue(func(ctx context.Context) {
if err := w.process(ctx, msg); err != nil {
- logrus.Errorf("%s %v", w.prefix, err)
+ log.Errorf("%s %v", w.prefix, err)
}
})
}
diff --git a/internal/config/validate.go b/internal/config/validate.go
index b2bdda960..b68cb2c62 100644
--- a/internal/config/validate.go
+++ b/internal/config/validate.go
@@ -24,7 +24,7 @@ import (
"strings"
"github.com/miekg/dns"
- "github.com/sirupsen/logrus"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// Validate validates global config settings which don't have defaults, to make sure they are set sensibly.
@@ -55,7 +55,7 @@ func Validate() error {
// no problem
break
case "http":
- logrus.Warnf("%s was set to 'http'; this should *only* be used for debugging and tests!", ProtocolFlag())
+ log.Warnf("%s was set to 'http'; this should *only* be used for debugging and tests!", ProtocolFlag())
case "":
errs = append(errs, fmt.Errorf("%s must be set", ProtocolFlag()))
default:
diff --git a/internal/db/bundb/account.go b/internal/db/bundb/account.go
index 2c97a6646..aaeb646cf 100644
--- a/internal/db/bundb/account.go
+++ b/internal/db/bundb/account.go
@@ -25,11 +25,11 @@ import (
"strings"
"time"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/cache"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
"github.com/uptrace/bun/dialect"
)
@@ -287,7 +287,7 @@ func (a *accountDB) GetAccountStatuses(ctx context.Context, accountID string, li
Where("? != '{}'", bun.Ident("attachments")).
Where("? != '[]'", bun.Ident("attachments"))
default:
- logrus.Panic("db dialect was neither pg nor sqlite")
+ log.Panic("db dialect was neither pg nor sqlite")
return q
}
})
@@ -383,7 +383,7 @@ func (a *accountDB) statusesFromIDs(ctx context.Context, statusIDs []string) ([]
// Fetch from status from database by ID
status, err := a.status.GetStatusByID(ctx, id)
if err != nil {
- logrus.Errorf("statusesFromIDs: error getting status %q: %v", id, err)
+ log.Errorf("statusesFromIDs: error getting status %q: %v", id, err)
continue
}
diff --git a/internal/db/bundb/admin.go b/internal/db/bundb/admin.go
index 8b9c7c9a3..1bda82d56 100644
--- a/internal/db/bundb/admin.go
+++ b/internal/db/bundb/admin.go
@@ -29,13 +29,12 @@ import (
"strings"
"time"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/uris"
"golang.org/x/crypto/bcrypt"
)
@@ -87,7 +86,7 @@ func (a *adminDB) IsEmailAvailable(ctx context.Context, email string) (bool, db.
func (a *adminDB) NewSignup(ctx context.Context, username string, reason string, requireApproval bool, email string, password string, signUpIP net.IP, locale string, appID string, emailVerified bool, admin bool) (*gtsmodel.User, db.Error) {
key, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
- logrus.Errorf("error creating new rsa key: %s", err)
+ log.Errorf("error creating new rsa key: %s", err)
return nil, err
}
@@ -190,13 +189,13 @@ func (a *adminDB) CreateInstanceAccount(ctx context.Context) db.Error {
return err
}
if exists {
- logrus.Infof("instance account %s already exists", username)
+ log.Infof("instance account %s already exists", username)
return nil
}
key, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
- logrus.Errorf("error creating new rsa key: %s", err)
+ log.Errorf("error creating new rsa key: %s", err)
return err
}
@@ -231,7 +230,7 @@ func (a *adminDB) CreateInstanceAccount(ctx context.Context) db.Error {
return a.conn.ProcessError(err)
}
- logrus.Infof("instance account %s CREATED with id %s", username, acct.ID)
+ log.Infof("instance account %s CREATED with id %s", username, acct.ID)
return nil
}
@@ -250,7 +249,7 @@ func (a *adminDB) CreateInstanceInstance(ctx context.Context) db.Error {
return err
}
if exists {
- logrus.Infof("instance entry already exists")
+ log.Infof("instance entry already exists")
return nil
}
@@ -275,6 +274,6 @@ func (a *adminDB) CreateInstanceInstance(ctx context.Context) db.Error {
return a.conn.ProcessError(err)
}
- logrus.Infof("created instance instance %s with id %s", host, i.ID)
+ log.Infof("created instance instance %s with id %s", host, i.ID)
return nil
}
diff --git a/internal/db/bundb/basic.go b/internal/db/bundb/basic.go
index 1e03fab72..b31a73dd7 100644
--- a/internal/db/bundb/basic.go
+++ b/internal/db/bundb/basic.go
@@ -22,10 +22,9 @@ import (
"context"
"errors"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
)
@@ -165,6 +164,6 @@ func (b *basicDB) IsHealthy(ctx context.Context) db.Error {
}
func (b *basicDB) Stop(ctx context.Context) db.Error {
- logrus.Info("closing db connection")
+ log.Info("closing db connection")
return b.conn.Close()
}
diff --git a/internal/db/bundb/bundb.go b/internal/db/bundb/bundb.go
index d92318afd..784a7d443 100644
--- a/internal/db/bundb/bundb.go
+++ b/internal/db/bundb/bundb.go
@@ -33,13 +33,13 @@ import (
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/stdlib"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/cache"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
"github.com/uptrace/bun/dialect/pgdialect"
"github.com/uptrace/bun/dialect/sqlitedialect"
@@ -89,8 +89,6 @@ type bunDBService struct {
}
func doMigration(ctx context.Context, db *bun.DB) error {
- l := logrus.WithField("func", "doMigration")
-
migrator := migrate.NewMigrator(db, migrations.Migrations)
if err := migrator.Init(ctx); err != nil {
@@ -106,11 +104,11 @@ func doMigration(ctx context.Context, db *bun.DB) error {
}
if group.ID == 0 {
- l.Info("there are no new migrations to run")
+ log.Info("there are no new migrations to run")
return nil
}
- l.Infof("MIGRATED DATABASE TO %s", group)
+ log.Infof("MIGRATED DATABASE TO %s", group)
return nil
}
@@ -243,7 +241,7 @@ func sqliteConn(ctx context.Context) (*DBConn, error) {
tweakConnectionValues(sqldb)
if dbAddress == "file::memory:?cache=shared" {
- logrus.Warn("sqlite in-memory database should only be used for debugging")
+ log.Warn("sqlite in-memory database should only be used for debugging")
// don't close connections on disconnect -- otherwise
// the SQLite database will be deleted when there
// are no active connections
@@ -260,7 +258,7 @@ func sqliteConn(ctx context.Context) (*DBConn, error) {
return nil, fmt.Errorf("sqlite ping: %s", err)
}
- logrus.Info("connected to SQLITE database")
+ log.Info("connected to SQLITE database")
return conn, nil
}
@@ -281,7 +279,7 @@ func pgConn(ctx context.Context) (*DBConn, error) {
return nil, fmt.Errorf("postgres ping: %s", err)
}
- logrus.Info("connected to POSTGRES database")
+ log.Info("connected to POSTGRES database")
return conn, nil
}
@@ -436,7 +434,7 @@ func (ps *bunDBService) EmojiStringsToEmojis(ctx context.Context, emojis []strin
if err != nil {
if err == sql.ErrNoRows {
// no result found for this username/domain so just don't include it as an emoji and carry on about our business
- logrus.Debugf("no emoji found with shortcode %s, skipping it", e)
+ log.Debugf("no emoji found with shortcode %s, skipping it", e)
continue
}
// a serious error has happened so bail
diff --git a/internal/db/bundb/hook.go b/internal/db/bundb/hook.go
index 6f9935272..23f334048 100644
--- a/internal/db/bundb/hook.go
+++ b/internal/db/bundb/hook.go
@@ -22,7 +22,9 @@ import (
"context"
"time"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "codeberg.org/gruf/go-logger/v2/level"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
)
@@ -38,21 +40,17 @@ func (queryHook) AfterQuery(_ context.Context, event *bun.QueryEvent) {
// Get the DB query duration
dur := time.Since(event.StartTime)
- log := func(lvl logrus.Level, msg string) {
- logrus.WithFields(logrus.Fields{
- "duration": dur,
- "operation": event.Operation(),
- "query": event.Query,
- }).Log(lvl, msg)
- }
-
switch {
// Warn on slow database queries
case dur > time.Second:
- log(logrus.WarnLevel, "SLOW DATABASE QUERY")
+ log.WithFields(kv.Fields{
+ {"duration", dur},
+ {"query", event.Query},
+ }...).Warn("SLOW DATABASE QUERY")
- // On trace, we log query information
- case logrus.GetLevel() == logrus.TraceLevel:
- log(logrus.TraceLevel, "database query")
+ // On trace, we log query information,
+ // manually crafting so DB query not escaped.
+ case log.Level() >= level.TRACE:
+ log.Printf("level=TRACE duration=%s query=%s", dur, event.Query)
}
}
diff --git a/internal/db/bundb/instance.go b/internal/db/bundb/instance.go
index c8a9c5776..fb6454e2f 100644
--- a/internal/db/bundb/instance.go
+++ b/internal/db/bundb/instance.go
@@ -21,11 +21,10 @@ package bundb
import (
"context"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
)
@@ -118,7 +117,7 @@ func (i *instanceDB) GetInstancePeers(ctx context.Context, includeSuspended bool
}
func (i *instanceDB) GetInstanceAccounts(ctx context.Context, domain string, maxID string, limit int) ([]*gtsmodel.Account, db.Error) {
- logrus.Debug("GetAccountsForInstance")
+ log.Debug("GetAccountsForInstance")
accounts := []*gtsmodel.Account{}
diff --git a/internal/db/bundb/mention.go b/internal/db/bundb/mention.go
index 067f0d676..e2c83ef3f 100644
--- a/internal/db/bundb/mention.go
+++ b/internal/db/bundb/mention.go
@@ -22,9 +22,9 @@ import (
"context"
"codeberg.org/gruf/go-cache/v2"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
)
@@ -72,7 +72,7 @@ func (m *mentionDB) GetMentions(ctx context.Context, ids []string) ([]*gtsmodel.
// Attempt fetch from DB
mention, err := m.GetMention(ctx, id)
if err != nil {
- logrus.Errorf("GetMentions: error getting mention %q: %v", id, err)
+ log.Errorf("GetMentions: error getting mention %q: %v", id, err)
continue
}
diff --git a/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go b/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go
index 1a3ae07aa..4c4ada594 100644
--- a/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go
+++ b/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go
@@ -26,14 +26,14 @@ import (
"codeberg.org/gruf/go-store/kv"
"codeberg.org/gruf/go-store/storage"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
)
func init() {
- deleteAttachment := func(ctx context.Context, l *logrus.Entry, a *gtsmodel.MediaAttachment, s *kv.KVStore, tx bun.Tx) {
+ deleteAttachment := func(ctx context.Context, l log.Entry, a *gtsmodel.MediaAttachment, s *kv.KVStore, tx bun.Tx) {
if err := s.Delete(a.File.Path); err != nil && err != storage.ErrNotFound {
l.Errorf("error removing file %s: %s", a.File.Path, err)
} else {
@@ -57,7 +57,7 @@ func init() {
}
up := func(ctx context.Context, db *bun.DB) error {
- l := logrus.WithField("migration", "20220612091800_duplicated_media_cleanup")
+ l := log.WithField("migration", "20220612091800_duplicated_media_cleanup")
if config.GetStorageBackend() != "local" {
// this migration only affects versions which only supported local storage
diff --git a/internal/db/bundb/migrations/main.go b/internal/db/bundb/migrations/main.go
index 318f9be3f..af43856fe 100644
--- a/internal/db/bundb/migrations/main.go
+++ b/internal/db/bundb/migrations/main.go
@@ -22,7 +22,5 @@ import (
"github.com/uptrace/bun/migrate"
)
-var (
- // Migrations provides migration logic for bun
- Migrations = migrate.NewMigrations()
-)
+// Migrations provides migration logic for bun
+var Migrations = migrate.NewMigrations()
diff --git a/internal/db/bundb/notification.go b/internal/db/bundb/notification.go
index f5ea099de..5e825d096 100644
--- a/internal/db/bundb/notification.go
+++ b/internal/db/bundb/notification.go
@@ -22,9 +22,9 @@ import (
"context"
"codeberg.org/gruf/go-cache/v2"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
type notificationDB struct {
@@ -98,7 +98,7 @@ func (n *notificationDB) GetNotifications(ctx context.Context, accountID string,
// Attempt fetch from DB
notif, err := n.GetNotification(ctx, id)
if err != nil {
- logrus.Errorf("GetNotifications: error getting notification %q: %v", id, err)
+ log.Errorf("GetNotifications: error getting notification %q: %v", id, err)
continue
}
diff --git a/internal/db/bundb/status.go b/internal/db/bundb/status.go
index 74a24ebaa..378ee1a7a 100644
--- a/internal/db/bundb/status.go
+++ b/internal/db/bundb/status.go
@@ -24,10 +24,10 @@ import (
"database/sql"
"time"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/cache"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
)
@@ -208,7 +208,7 @@ func (s *statusDB) GetStatusChildren(ctx context.Context, status *gtsmodel.Statu
// only append children, not the overall parent status
entry, ok := e.Value.(*gtsmodel.Status)
if !ok {
- logrus.Panic("GetStatusChildren: found status could not be asserted to *gtsmodel.Status")
+ log.Panic("GetStatusChildren: found status could not be asserted to *gtsmodel.Status")
}
if entry.ID != status.ID {
@@ -233,7 +233,7 @@ func (s *statusDB) statusChildren(ctx context.Context, status *gtsmodel.Status,
if err := q.Scan(ctx, &childIDs); err != nil {
if err != sql.ErrNoRows {
- logrus.Errorf("statusChildren: error getting children for %q: %v", status.ID, err)
+ log.Errorf("statusChildren: error getting children for %q: %v", status.ID, err)
}
return
}
@@ -242,7 +242,7 @@ func (s *statusDB) statusChildren(ctx context.Context, status *gtsmodel.Status,
// Fetch child with ID from database
child, err := s.GetStatusByID(ctx, id)
if err != nil {
- logrus.Errorf("statusChildren: error getting child status %q: %v", id, err)
+ log.Errorf("statusChildren: error getting child status %q: %v", id, err)
continue
}
@@ -250,7 +250,7 @@ func (s *statusDB) statusChildren(ctx context.Context, status *gtsmodel.Status,
for e := foundStatuses.Front(); e != nil; e = e.Next() {
entry, ok := e.Value.(*gtsmodel.Status)
if !ok {
- logrus.Panic("statusChildren: found status could not be asserted to *gtsmodel.Status")
+ log.Panic("statusChildren: found status could not be asserted to *gtsmodel.Status")
}
if child.InReplyToAccountID != "" && entry.ID == child.InReplyToID {
diff --git a/internal/db/bundb/timeline.go b/internal/db/bundb/timeline.go
index 3c0d6d7e4..d2b3cf07e 100644
--- a/internal/db/bundb/timeline.go
+++ b/internal/db/bundb/timeline.go
@@ -21,9 +21,9 @@ package bundb
import (
"context"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
"golang.org/x/exp/slices"
)
@@ -96,7 +96,7 @@ func (t *timelineDB) GetHomeTimeline(ctx context.Context, accountID string, maxI
// Fetch status from db for ID
status, err := t.status.GetStatusByID(ctx, id)
if err != nil {
- logrus.Errorf("GetHomeTimeline: error fetching status %q: %v", id, err)
+ log.Errorf("GetHomeTimeline: error fetching status %q: %v", id, err)
continue
}
@@ -156,7 +156,7 @@ func (t *timelineDB) GetPublicTimeline(ctx context.Context, accountID string, ma
// Fetch status from db for ID
status, err := t.status.GetStatusByID(ctx, id)
if err != nil {
- logrus.Errorf("GetPublicTimeline: error fetching status %q: %v", id, err)
+ log.Errorf("GetPublicTimeline: error fetching status %q: %v", id, err)
continue
}
@@ -216,7 +216,7 @@ func (t *timelineDB) GetFavedTimeline(ctx context.Context, accountID string, max
// Fetch status from db for corresponding favourite
status, err := t.status.GetStatusByID(ctx, fave.StatusID)
if err != nil {
- logrus.Errorf("GetFavedTimeline: error fetching status for fave %q: %v", fave.ID, err)
+ log.Errorf("GetFavedTimeline: error fetching status for fave %q: %v", fave.ID, err)
continue
}
diff --git a/internal/email/confirm.go b/internal/email/confirm.go
index b49004056..7cc32f330 100644
--- a/internal/email/confirm.go
+++ b/internal/email/confirm.go
@@ -22,8 +22,8 @@ import (
"bytes"
"net/smtp"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
const (
@@ -42,7 +42,7 @@ func (s *sender) SendConfirmEmail(toAddress string, data ConfirmData) error {
if err != nil {
return err
}
- logrus.WithField("func", "SendConfirmEmail").Trace(s.hostAddress + "\n" + config.GetSMTPUsername() + ":password" + "\n" + s.from + "\n" + toAddress + "\n\n" + string(msg) + "\n")
+ log.Trace(s.hostAddress + "\n" + config.GetSMTPUsername() + ":password" + "\n" + s.from + "\n" + toAddress + "\n\n" + string(msg) + "\n")
return smtp.SendMail(s.hostAddress, s.auth, s.from, []string{toAddress}, msg)
}
diff --git a/internal/email/noopsender.go b/internal/email/noopsender.go
index 9aab1ca41..4f4aa2014 100644
--- a/internal/email/noopsender.go
+++ b/internal/email/noopsender.go
@@ -22,8 +22,8 @@ import (
"bytes"
"text/template"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// NewNoopSender returns a no-op email sender that will just execute the given sendCallback
@@ -61,7 +61,7 @@ func (s *noopSender) SendConfirmEmail(toAddress string, data ConfirmData) error
return err
}
- logrus.Tracef("NOT SENDING confirmation email to %s with contents: %s", toAddress, msg)
+ log.Tracef("NOT SENDING confirmation email to %s with contents: %s", toAddress, msg)
if s.sendCallback != nil {
s.sendCallback(toAddress, string(msg))
@@ -81,7 +81,7 @@ func (s *noopSender) SendResetEmail(toAddress string, data ResetData) error {
return err
}
- logrus.Tracef("NOT SENDING reset email to %s with contents: %s", toAddress, msg)
+ log.Tracef("NOT SENDING reset email to %s with contents: %s", toAddress, msg)
if s.sendCallback != nil {
s.sendCallback(toAddress, string(msg))
diff --git a/internal/email/util.go b/internal/email/util.go
index c543db755..80534d6ae 100644
--- a/internal/email/util.go
+++ b/internal/email/util.go
@@ -45,7 +45,6 @@ func loadTemplates(templateBaseDir string) (*template.Template, error) {
// https://pkg.go.dev/net/smtp#SendMail
// and it did seem to work.
func assembleMessage(mailSubject string, mailBody string, mailTo string, mailFrom string) ([]byte, error) {
-
if strings.Contains(mailSubject, "\r") || strings.Contains(mailSubject, "\n") {
return nil, errors.New("email subject must not contain newline characters")
}
diff --git a/internal/federation/authenticate.go b/internal/federation/authenticate.go
index 5ca2f9806..cb693892e 100644
--- a/internal/federation/authenticate.go
+++ b/internal/federation/authenticate.go
@@ -28,8 +28,6 @@ import (
"net/url"
"strings"
- "github.com/sirupsen/logrus"
-
"github.com/go-fed/httpsig"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams"
@@ -39,6 +37,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
/*
@@ -116,8 +115,6 @@ func getPublicKeyFromResponse(c context.Context, b []byte, keyID *url.URL) (voca
// Also note that this function *does not* dereference the remote account that the signature key is associated with.
// Other functions should use the returned URL to dereference the remote account, if required.
func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedUsername string) (*url.URL, gtserror.WithCode) {
- l := logrus.WithField("func", "AuthenticateFederatedRequest")
-
var publicKey interface{}
var pkOwnerURI *url.URL
var err error
@@ -127,7 +124,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
if vi == nil {
err := errors.New("http request wasn't signed or http signature was invalid")
errWithCode := gtserror.NewErrorUnauthorized(err, err.Error())
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -135,7 +132,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
if !ok {
err := errors.New("http request wasn't signed or http signature was invalid")
errWithCode := gtserror.NewErrorUnauthorized(err, err.Error())
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -144,7 +141,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
if si == nil {
err := errors.New("http request wasn't signed or http signature was invalid")
errWithCode := gtserror.NewErrorUnauthorized(err, err.Error())
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -152,7 +149,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
if !ok {
err := errors.New("http request wasn't signed or http signature was invalid")
errWithCode := gtserror.NewErrorUnauthorized(err, err.Error())
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -160,7 +157,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
requestingPublicKeyID, err := url.Parse(verifier.KeyId())
if err != nil {
errWithCode := gtserror.NewErrorBadRequest(err, fmt.Sprintf("couldn't parse public key URL %s", verifier.KeyId()))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -170,39 +167,39 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
if host := config.GetHost(); strings.EqualFold(requestingHost, host) {
// LOCAL ACCOUNT REQUEST
// the request is coming from INSIDE THE HOUSE so skip the remote dereferencing
- l.Tracef("proceeding without dereference for local public key %s", requestingPublicKeyID)
+ log.Tracef("proceeding without dereference for local public key %s", requestingPublicKeyID)
if err := f.db.GetWhere(ctx, []db.Where{{Key: "public_key_uri", Value: requestingPublicKeyID.String()}}, requestingLocalAccount); err != nil {
errWithCode := gtserror.NewErrorInternalError(fmt.Errorf("couldn't get account with public key uri %s from the database: %s", requestingPublicKeyID.String(), err))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
publicKey = requestingLocalAccount.PublicKey
pkOwnerURI, err = url.Parse(requestingLocalAccount.URI)
if err != nil {
errWithCode := gtserror.NewErrorBadRequest(err, fmt.Sprintf("couldn't parse public key owner URL %s", requestingLocalAccount.URI))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
} else if err := f.db.GetWhere(ctx, []db.Where{{Key: "public_key_uri", Value: requestingPublicKeyID.String()}}, requestingRemoteAccount); err == nil {
// REMOTE ACCOUNT REQUEST WITH KEY CACHED LOCALLY
// this is a remote account and we already have the public key for it so use that
- l.Tracef("proceeding without dereference for cached public key %s", requestingPublicKeyID)
+ log.Tracef("proceeding without dereference for cached public key %s", requestingPublicKeyID)
publicKey = requestingRemoteAccount.PublicKey
pkOwnerURI, err = url.Parse(requestingRemoteAccount.URI)
if err != nil {
errWithCode := gtserror.NewErrorBadRequest(err, fmt.Sprintf("couldn't parse public key owner URL %s", requestingRemoteAccount.URI))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
} else {
// REMOTE ACCOUNT REQUEST WITHOUT KEY CACHED LOCALLY
// the request is remote and we don't have the public key yet,
// so we need to authenticate the request properly by dereferencing the remote key
- l.Tracef("proceeding with dereference for uncached public key %s", requestingPublicKeyID)
+ log.Tracef("proceeding with dereference for uncached public key %s", requestingPublicKeyID)
transport, err := f.transportController.NewTransportForUsername(ctx, requestedUsername)
if err != nil {
errWithCode := gtserror.NewErrorInternalError(fmt.Errorf("error creating transport for %s: %s", requestedUsername, err))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -210,7 +207,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
b, err := transport.Dereference(ctx, requestingPublicKeyID)
if err != nil {
errWithCode := gtserror.NewErrorUnauthorized(fmt.Errorf("error dereferencing public key %s: %s", requestingPublicKeyID, err))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -218,7 +215,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
requestingPublicKey, err := getPublicKeyFromResponse(ctx, b, requestingPublicKeyID)
if err != nil {
errWithCode := gtserror.NewErrorUnauthorized(fmt.Errorf("error parsing public key %s: %s", requestingPublicKeyID, err))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -226,7 +223,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
pkPemProp := requestingPublicKey.GetW3IDSecurityV1PublicKeyPem()
if pkPemProp == nil || !pkPemProp.IsXMLSchemaString() {
errWithCode := gtserror.NewErrorUnauthorized(errors.New("publicKeyPem property is not provided or it is not embedded as a value"))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -235,14 +232,14 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
block, _ := pem.Decode([]byte(pubKeyPem))
if block == nil || block.Type != "PUBLIC KEY" {
errWithCode := gtserror.NewErrorUnauthorized(errors.New("could not decode publicKeyPem to PUBLIC KEY pem block type"))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
publicKey, err = x509.ParsePKIXPublicKey(block.Bytes)
if err != nil {
errWithCode := gtserror.NewErrorUnauthorized(fmt.Errorf("could not parse public key %s from block bytes: %s", requestingPublicKeyID, err))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -250,7 +247,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
pkOwnerProp := requestingPublicKey.GetW3IDSecurityV1Owner()
if pkOwnerProp == nil || !pkOwnerProp.IsIRI() {
errWithCode := gtserror.NewErrorUnauthorized(errors.New("publicKeyOwner property is not provided or it is not embedded as a value"))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
pkOwnerURI = pkOwnerProp.GetIRI()
@@ -259,7 +256,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
// after all that, public key should be defined
if publicKey == nil {
errWithCode := gtserror.NewErrorInternalError(errors.New("returned public key was empty"))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
@@ -271,16 +268,16 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
}
for _, algo := range algos {
- l.Tracef("trying algo: %s", algo)
+ log.Tracef("trying algo: %s", algo)
err := verifier.Verify(publicKey, algo)
if err == nil {
- l.Tracef("authentication for %s PASSED with algorithm %s", pkOwnerURI, algo)
+ log.Tracef("authentication for %s PASSED with algorithm %s", pkOwnerURI, algo)
return pkOwnerURI, nil
}
- l.Tracef("authentication for %s NOT PASSED with algorithm %s: %s", pkOwnerURI, algo, err)
+ log.Tracef("authentication for %s NOT PASSED with algorithm %s: %s", pkOwnerURI, algo, err)
}
errWithCode := gtserror.NewErrorUnauthorized(fmt.Errorf("authentication not passed for public key owner %s; signature value was '%s'", pkOwnerURI, signature))
- l.Debug(errWithCode)
+ log.Debug(errWithCode)
return nil, errWithCode
}
diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go
index c479906d7..a0e2b87ae 100644
--- a/internal/federation/dereferencing/account.go
+++ b/internal/federation/dereferencing/account.go
@@ -29,13 +29,13 @@ import (
"sync"
"time"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/transport"
)
@@ -79,7 +79,6 @@ type GetRemoteAccountParams struct {
// GetRemoteAccount completely dereferences a remote account, converts it to a GtS model account,
// puts or updates it in the database (if necessary), and returns it to a caller.
func (d *deref) GetRemoteAccount(ctx context.Context, params GetRemoteAccountParams) (remoteAccount *gtsmodel.Account, err error) {
-
/*
In this function we want to retrieve a gtsmodel representation of a remote account, with its proper
accountDomain set, while making as few calls to remote instances as possible to save time and bandwidth.
@@ -454,7 +453,7 @@ func (d *deref) fetchRemoteAccountMedia(ctx context.Context, targetAccount *gtsm
go func() {
dlCtx, done := context.WithDeadline(context.Background(), time.Now().Add(1*time.Minute))
if err := lockAndLoad(dlCtx, d.dereferencingAvatarsLock, processingMedia, d.dereferencingAvatars, targetAccount.ID); err != nil {
- logrus.Errorf("fetchRemoteAccountMedia: error during async lock and load of avatar: %s", err)
+ log.Errorf("fetchRemoteAccountMedia: error during async lock and load of avatar: %s", err)
}
done()
}()
@@ -512,7 +511,7 @@ func (d *deref) fetchRemoteAccountMedia(ctx context.Context, targetAccount *gtsm
go func() {
dlCtx, done := context.WithDeadline(context.Background(), time.Now().Add(1*time.Minute))
if err := lockAndLoad(dlCtx, d.dereferencingHeadersLock, processingMedia, d.dereferencingHeaders, targetAccount.ID); err != nil {
- logrus.Errorf("fetchRemoteAccountMedia: error during async lock and load of header: %s", err)
+ log.Errorf("fetchRemoteAccountMedia: error during async lock and load of header: %s", err)
}
done()
}()
diff --git a/internal/federation/dereferencing/status.go b/internal/federation/dereferencing/status.go
index 8cb110f24..e6e03646c 100644
--- a/internal/federation/dereferencing/status.go
+++ b/internal/federation/dereferencing/status.go
@@ -26,12 +26,13 @@ import (
"net/url"
"strings"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
)
@@ -224,10 +225,10 @@ func (d *deref) dereferenceStatusable(ctx context.Context, username string, remo
// and attach them to the status. The status itself will not be added to the database yet,
// that's up the caller to do.
func (d *deref) populateStatusFields(ctx context.Context, status *gtsmodel.Status, requestingUsername string, includeParent bool) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "dereferenceStatusFields",
- "status": fmt.Sprintf("%+v", status),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"status", status},
+ }...)
l.Debug("entering function")
statusIRI, err := url.Parse(status.URI)
@@ -288,20 +289,20 @@ func (d *deref) populateStatusMentions(ctx context.Context, status *gtsmodel.Sta
for _, m := range status.Mentions {
if m.ID != "" {
// we've already populated this mention, since it has an ID
- logrus.Debug("populateStatusMentions: mention already populated")
+ log.Debug("populateStatusMentions: mention already populated")
mentionIDs = append(mentionIDs, m.ID)
newMentions = append(newMentions, m)
continue
}
if m.TargetAccountURI == "" {
- logrus.Debug("populateStatusMentions: target URI not set on mention")
+ log.Debug("populateStatusMentions: target URI not set on mention")
continue
}
targetAccountURI, err := url.Parse(m.TargetAccountURI)
if err != nil {
- logrus.Debugf("populateStatusMentions: error parsing mentioned account uri %s: %s", m.TargetAccountURI, err)
+ log.Debugf("populateStatusMentions: error parsing mentioned account uri %s: %s", m.TargetAccountURI, err)
continue
}
@@ -312,7 +313,7 @@ func (d *deref) populateStatusMentions(ctx context.Context, status *gtsmodel.Sta
if a, err := d.db.GetAccountByURI(ctx, targetAccountURI.String()); err != nil {
errs = append(errs, err.Error())
} else {
- logrus.Debugf("populateStatusMentions: got target account %s with id %s through GetAccountByURI", targetAccountURI, a.ID)
+ log.Debugf("populateStatusMentions: got target account %s with id %s through GetAccountByURI", targetAccountURI, a.ID)
targetAccount = a
}
@@ -325,13 +326,13 @@ func (d *deref) populateStatusMentions(ctx context.Context, status *gtsmodel.Sta
}); err != nil {
errs = append(errs, err.Error())
} else {
- logrus.Debugf("populateStatusMentions: got target account %s with id %s through GetRemoteAccount", targetAccountURI, a.ID)
+ log.Debugf("populateStatusMentions: got target account %s with id %s through GetRemoteAccount", targetAccountURI, a.ID)
targetAccount = a
}
}
if targetAccount == nil {
- logrus.Debugf("populateStatusMentions: couldn't get target account %s: %s", m.TargetAccountURI, strings.Join(errs, " : "))
+ log.Debugf("populateStatusMentions: couldn't get target account %s: %s", m.TargetAccountURI, strings.Join(errs, " : "))
continue
}
@@ -392,13 +393,13 @@ func (d *deref) populateStatusAttachments(ctx context.Context, status *gtsmodel.
Blurhash: &a.Blurhash,
})
if err != nil {
- logrus.Errorf("populateStatusAttachments: couldn't get remote media %s: %s", a.RemoteURL, err)
+ log.Errorf("populateStatusAttachments: couldn't get remote media %s: %s", a.RemoteURL, err)
continue
}
attachment, err := processingMedia.LoadAttachment(ctx)
if err != nil {
- logrus.Errorf("populateStatusAttachments: couldn't load remote attachment %s: %s", a.RemoteURL, err)
+ log.Errorf("populateStatusAttachments: couldn't load remote attachment %s: %s", a.RemoteURL, err)
continue
}
diff --git a/internal/federation/dereferencing/thread.go b/internal/federation/dereferencing/thread.go
index a299c1220..7d7431110 100644
--- a/internal/federation/dereferencing/thread.go
+++ b/internal/federation/dereferencing/thread.go
@@ -23,9 +23,10 @@ import (
"fmt"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/uris"
)
@@ -36,11 +37,11 @@ import (
// presented by remote instances as part of their replies collections, and will likely involve making several calls to
// multiple different hosts.
func (d *deref) DereferenceThread(ctx context.Context, username string, statusIRI *url.URL) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "DereferenceThread",
- "username": username,
- "statusIRI": statusIRI.String(),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"username", username},
+ {"statusIRI", statusIRI},
+ }...)
l.Trace("entering DereferenceThread")
// if it's our status we already have everything stashed so we can bail early
@@ -70,11 +71,11 @@ func (d *deref) DereferenceThread(ctx context.Context, username string, statusIR
// iterateAncestors has the goal of reaching the oldest ancestor of a given status, and stashing all statuses along the way.
func (d *deref) iterateAncestors(ctx context.Context, username string, statusIRI url.URL) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "iterateAncestors",
- "username": username,
- "statusIRI": statusIRI.String(),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"username", username},
+ {"statusIRI", statusIRI},
+ }...)
l.Trace("entering iterateAncestors")
// if it's our status we don't need to dereference anything so we can immediately move up the chain
@@ -123,11 +124,11 @@ func (d *deref) iterateAncestors(ctx context.Context, username string, statusIRI
}
func (d *deref) iterateDescendants(ctx context.Context, username string, statusIRI url.URL, statusable ap.Statusable) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "iterateDescendants",
- "username": username,
- "statusIRI": statusIRI.String(),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"username", username},
+ {"statusIRI", statusIRI},
+ }...)
l.Trace("entering iterateDescendants")
// if it's our status we already have descendants stashed so we can bail early
diff --git a/internal/federation/federatingactor.go b/internal/federation/federatingactor.go
index 1d6f4b937..b80e9ff23 100644
--- a/internal/federation/federatingactor.go
+++ b/internal/federation/federatingactor.go
@@ -23,9 +23,9 @@ import (
"net/http"
"net/url"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams/vocab"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// federatingActor implements the go-fed federating protocol interface
@@ -56,7 +56,7 @@ func newFederatingActor(c pub.CommonBehavior, s2s pub.FederatingProtocol, db pub
// method will guaranteed work for non-custom Actors. For custom actors,
// care should be used to not call this method if only C2S is supported.
func (f *federatingActor) Send(c context.Context, outbox *url.URL, t vocab.Type) (pub.Activity, error) {
- logrus.Infof("federating actor: send activity %s via outbox %s", t.GetTypeName(), outbox)
+ log.Infof("federating actor: send activity %s via outbox %s", t.GetTypeName(), outbox)
return f.actor.Send(c, outbox, t)
}
diff --git a/internal/federation/federatingdb/accept.go b/internal/federation/federatingdb/accept.go
index f22db38a5..977cf2bba 100644
--- a/internal/federation/federatingdb/accept.go
+++ b/internal/federation/federatingdb/accept.go
@@ -23,28 +23,23 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/uris"
)
func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsAccept) error {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Accept",
- },
- )
-
- if logrus.GetLevel() >= logrus.DebugLevel {
+ if log.Level() >= level.DEBUG {
i, err := marshalItem(accept)
if err != nil {
return err
}
- l = l.WithField("accept", i)
+ l := log.WithField("accept", i)
l.Debug("entering Accept")
}
diff --git a/internal/federation/federatingdb/announce.go b/internal/federation/federatingdb/announce.go
index b70fa1913..47e873ca3 100644
--- a/internal/federation/federatingdb/announce.go
+++ b/internal/federation/federatingdb/announce.go
@@ -22,25 +22,20 @@ import (
"context"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
)
func (f *federatingDB) Announce(ctx context.Context, announce vocab.ActivityStreamsAnnounce) error {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Announce",
- },
- )
-
- if logrus.GetLevel() >= logrus.DebugLevel {
+ if log.Level() >= level.DEBUG {
i, err := marshalItem(announce)
if err != nil {
return err
}
- l = l.WithField("announce", i)
+ l := log.WithField("announce", i)
l.Debug("entering Announce")
}
diff --git a/internal/federation/federatingdb/create.go b/internal/federation/federatingdb/create.go
index 625d75603..a6e55f2ad 100644
--- a/internal/federation/federatingdb/create.go
+++ b/internal/federation/federatingdb/create.go
@@ -24,12 +24,14 @@ import (
"fmt"
"strings"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
)
@@ -46,18 +48,12 @@ import (
// Under certain conditions and network activities, Create may be called
// multiple times for the same ActivityStreams object.
func (f *federatingDB) Create(ctx context.Context, asType vocab.Type) error {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Create",
- },
- )
-
- if logrus.GetLevel() >= logrus.DebugLevel {
+ if log.Level() >= level.DEBUG {
i, err := marshalItem(asType)
if err != nil {
return err
}
- l = l.WithField("create", i)
+ l := log.WithField("create", i)
l.Debug("entering Create")
}
@@ -169,11 +165,10 @@ func (f *federatingDB) activityCreate(ctx context.Context, asType vocab.Type, re
// createNote handles a Create activity with a Note type.
func (f *federatingDB) createNote(ctx context.Context, note vocab.ActivityStreamsNote, receivingAccount *gtsmodel.Account, requestingAccount *gtsmodel.Account) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "createNote",
- "receivingAccount": receivingAccount.URI,
- "requestingAccount": requestingAccount.URI,
- })
+ l := log.WithFields(kv.Fields{
+ {"receivingAccount", receivingAccount.URI},
+ {"requestingAccount", requestingAccount.URI},
+ }...)
// Check if we have a forward.
// In other words, was the note posted to our inbox by at least one actor who actually created the note, or are they just forwarding it?
diff --git a/internal/federation/federatingdb/delete.go b/internal/federation/federatingdb/delete.go
index bd0184f76..8c3457fae 100644
--- a/internal/federation/federatingdb/delete.go
+++ b/internal/federation/federatingdb/delete.go
@@ -23,9 +23,10 @@ import (
"fmt"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
)
@@ -36,12 +37,10 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Delete(ctx context.Context, id *url.URL) error {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Delete",
- "id": id,
- },
- )
+ l := log.WithFields(kv.Fields{
+
+ {"id", id},
+ }...)
l.Debug("entering Delete")
receivingAccount, _ := extractFromCtx(ctx)
diff --git a/internal/federation/federatingdb/exists.go b/internal/federation/federatingdb/exists.go
index fe220fc71..65b2a55b3 100644
--- a/internal/federation/federatingdb/exists.go
+++ b/internal/federation/federatingdb/exists.go
@@ -22,7 +22,8 @@ import (
"context"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// Exists returns true if the database has an entry for the specified
@@ -32,12 +33,9 @@ import (
//
// Implementation note: this just straight up isn't implemented, and doesn't *really* need to be either.
func (f *federatingDB) Exists(c context.Context, id *url.URL) (exists bool, err error) {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Exists",
- "id": id,
- },
- )
+ l := log.WithFields(kv.Fields{
+ {"id", id},
+ }...)
l.Debug("entering Exists")
return false, nil
}
diff --git a/internal/federation/federatingdb/followers.go b/internal/federation/federatingdb/followers.go
index 96b824c66..9a80d5f0b 100644
--- a/internal/federation/federatingdb/followers.go
+++ b/internal/federation/federatingdb/followers.go
@@ -5,9 +5,10 @@ import (
"fmt"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// Followers obtains the Followers Collection for an actor with the
@@ -17,12 +18,9 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Followers(ctx context.Context, actorIRI *url.URL) (followers vocab.ActivityStreamsCollection, err error) {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Followers",
- "id": actorIRI,
- },
- )
+ l := log.WithFields(kv.Fields{
+ {"id", actorIRI},
+ }...)
l.Debug("entering Followers")
acct, err := f.getAccountForIRI(ctx, actorIRI)
diff --git a/internal/federation/federatingdb/following.go b/internal/federation/federatingdb/following.go
index 62b148d5b..a244cf7ac 100644
--- a/internal/federation/federatingdb/following.go
+++ b/internal/federation/federatingdb/following.go
@@ -23,9 +23,10 @@ import (
"fmt"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// Following obtains the Following Collection for an actor with the
@@ -35,12 +36,9 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Following(ctx context.Context, actorIRI *url.URL) (following vocab.ActivityStreamsCollection, err error) {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Following",
- "id": actorIRI,
- },
- )
+ l := log.WithFields(kv.Fields{
+ {"id", actorIRI},
+ }...)
l.Debug("entering Following")
acct, err := f.getAccountForIRI(ctx, actorIRI)
diff --git a/internal/federation/federatingdb/get.go b/internal/federation/federatingdb/get.go
index 9fdc08dd9..5467c886d 100644
--- a/internal/federation/federatingdb/get.go
+++ b/internal/federation/federatingdb/get.go
@@ -23,8 +23,9 @@ import (
"errors"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/activity/streams/vocab"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/uris"
)
@@ -32,12 +33,9 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Get(ctx context.Context, id *url.URL) (value vocab.Type, err error) {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Get",
- "id": id,
- },
- )
+ l := log.WithFields(kv.Fields{
+ {"id", id},
+ }...)
l.Debug("entering Get")
if uris.IsUserPath(id) {
diff --git a/internal/federation/federatingdb/owns.go b/internal/federation/federatingdb/owns.go
index aaa58348f..51d11f018 100644
--- a/internal/federation/federatingdb/owns.go
+++ b/internal/federation/federatingdb/owns.go
@@ -23,10 +23,11 @@ import (
"fmt"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/uris"
)
@@ -34,12 +35,9 @@ import (
// the database has an entry for the IRI.
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Owns(ctx context.Context, id *url.URL) (bool, error) {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Owns",
- "id": id,
- },
- )
+ l := log.WithFields(kv.Fields{
+ {"id", id},
+ }...)
l.Debug("entering Owns")
// if the id host isn't this instance host, we don't own this IRI
diff --git a/internal/federation/federatingdb/reject.go b/internal/federation/federatingdb/reject.go
index 9cb81c267..b77c3ce3a 100644
--- a/internal/federation/federatingdb/reject.go
+++ b/internal/federation/federatingdb/reject.go
@@ -23,27 +23,22 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/uris"
)
func (f *federatingDB) Reject(ctx context.Context, reject vocab.ActivityStreamsReject) error {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Reject",
- },
- )
-
- if logrus.GetLevel() >= logrus.DebugLevel {
+ if log.Level() >= level.DEBUG {
i, err := marshalItem(reject)
if err != nil {
return err
}
- l = l.WithField("reject", i)
+ l := log.WithField("reject", i)
l.Debug("entering Reject")
}
diff --git a/internal/federation/federatingdb/undo.go b/internal/federation/federatingdb/undo.go
index 92f24f315..4cb3d0fa8 100644
--- a/internal/federation/federatingdb/undo.go
+++ b/internal/federation/federatingdb/undo.go
@@ -23,21 +23,18 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (f *federatingDB) Undo(ctx context.Context, undo vocab.ActivityStreamsUndo) error {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Undo",
- },
- )
+ l := log.Entry{}
- if logrus.GetLevel() >= logrus.DebugLevel {
+ if log.Level() >= level.DEBUG {
i, err := marshalItem(undo)
if err != nil {
return err
diff --git a/internal/federation/federatingdb/update.go b/internal/federation/federatingdb/update.go
index 09d5c8fd8..599544e34 100644
--- a/internal/federation/federatingdb/update.go
+++ b/internal/federation/federatingdb/update.go
@@ -23,11 +23,12 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
)
@@ -41,13 +42,9 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Update(ctx context.Context, asType vocab.Type) error {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "Update",
- },
- )
+ l := log.Entry{}
- if logrus.GetLevel() >= logrus.DebugLevel {
+ if log.Level() >= level.DEBUG {
i, err := marshalItem(asType)
if err != nil {
return err
diff --git a/internal/federation/federatingdb/util.go b/internal/federation/federatingdb/util.go
index 7f27cc759..9fc35faa4 100644
--- a/internal/federation/federatingdb/util.go
+++ b/internal/federation/federatingdb/util.go
@@ -25,7 +25,7 @@ import (
"fmt"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
@@ -33,6 +33,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/uris"
)
@@ -63,18 +64,12 @@ func sameActor(activityActor vocab.ActivityStreamsActorProperty, followActor voc
// The go-fed library will handle setting the 'id' property on the
// activity or object provided with the value returned.
func (f *federatingDB) NewID(ctx context.Context, t vocab.Type) (idURL *url.URL, err error) {
- l := logrus.WithFields(
- logrus.Fields{
- "func": "NewID",
- },
- )
-
- if logrus.GetLevel() >= logrus.DebugLevel {
+ if log.Level() >= level.DEBUG {
i, err := marshalItem(t)
if err != nil {
return nil, err
}
- l = l.WithField("newID", i)
+ l := log.WithField("newID", i)
l.Debug("entering NewID")
}
@@ -312,7 +307,7 @@ func extractFromCtx(ctx context.Context) (receivingAccount, requestingAccount *g
var ok bool
receivingAccount, ok = receivingAccountI.(*gtsmodel.Account)
if !ok {
- logrus.Panicf("extractFromCtx: context entry with key %s could not be asserted to *gtsmodel.Account", ap.ContextReceivingAccount)
+ log.Panicf("extractFromCtx: context entry with key %s could not be asserted to *gtsmodel.Account", ap.ContextReceivingAccount)
}
}
@@ -321,7 +316,7 @@ func extractFromCtx(ctx context.Context) (receivingAccount, requestingAccount *g
var ok bool
requestingAccount, ok = requestingAcctI.(*gtsmodel.Account)
if !ok {
- logrus.Panicf("extractFromCtx: context entry with key %s could not be asserted to *gtsmodel.Account", ap.ContextRequestingAccount)
+ log.Panicf("extractFromCtx: context entry with key %s could not be asserted to *gtsmodel.Account", ap.ContextRequestingAccount)
}
}
diff --git a/internal/federation/federatingprotocol.go b/internal/federation/federatingprotocol.go
index 8944987c5..8242ca4b1 100644
--- a/internal/federation/federatingprotocol.go
+++ b/internal/federation/federatingprotocol.go
@@ -25,7 +25,7 @@ import (
"net/http"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/activity/streams/vocab"
@@ -33,6 +33,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/uris"
"github.com/superseriousbusiness/gotosocial/internal/util"
)
@@ -137,11 +138,10 @@ func (f *federator) PostInboxRequestBodyHook(ctx context.Context, r *http.Reques
// authenticated must be true and error nil. The request will continue
// to be processed.
func (f *federator) AuthenticatePostInbox(ctx context.Context, w http.ResponseWriter, r *http.Request) (context.Context, bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "AuthenticatePostInbox",
- "useragent": r.UserAgent(),
- "url": r.URL.String(),
- })
+ l := log.WithFields(kv.Fields{
+ {"useragent", r.UserAgent()},
+ {"url", r.URL.String()},
+ }...)
l.Trace("received request to authenticate")
if !uris.IsInboxPath(r.URL) {
@@ -226,10 +226,7 @@ func (f *federator) AuthenticatePostInbox(ctx context.Context, w http.ResponseWr
// blocked must be false and error nil. The request will continue
// to be processed.
func (f *federator) Blocked(ctx context.Context, actorIRIs []*url.URL) (bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Blocked",
- })
- l.Debugf("entering BLOCKED function with IRI list: %+v", actorIRIs)
+ log.Debugf("entering BLOCKED function with IRI list: %+v", actorIRIs)
// check domain blocks first for the given actor IRIs
blocked, err := f.db.AreURIsBlocked(ctx, actorIRIs)
@@ -244,7 +241,7 @@ func (f *federator) Blocked(ctx context.Context, actorIRIs []*url.URL) (bool, er
otherInvolvedIRIsI := ctx.Value(ap.ContextOtherInvolvedIRIs)
otherInvolvedIRIs, ok := otherInvolvedIRIsI.([]*url.URL)
if !ok {
- l.Errorf("other involved IRIs not set on request context")
+ log.Error("other involved IRIs not set on request context")
return false, errors.New("other involved IRIs not set on request context, so couldn't determine blocks")
}
blocked, err = f.db.AreURIsBlocked(ctx, otherInvolvedIRIs)
@@ -259,13 +256,13 @@ func (f *federator) Blocked(ctx context.Context, actorIRIs []*url.URL) (bool, er
receivingAccountI := ctx.Value(ap.ContextReceivingAccount)
receivingAccount, ok := receivingAccountI.(*gtsmodel.Account)
if !ok {
- l.Errorf("receiving account not set on request context")
+ log.Error("receiving account not set on request context")
return false, errors.New("receiving account not set on request context, so couldn't determine blocks")
}
requestingAccountI := ctx.Value(ap.ContextRequestingAccount)
requestingAccount, ok := requestingAccountI.(*gtsmodel.Account)
if !ok {
- l.Errorf("requesting account not set on request context")
+ log.Error("requesting account not set on request context")
return false, errors.New("requesting account not set on request context, so couldn't determine blocks")
}
// the receiver shouldn't block the sender
@@ -371,10 +368,9 @@ func (f *federator) FederatingCallbacks(ctx context.Context) (wrapped pub.Federa
// type and extension, so the unhandled ones are passed to
// DefaultCallback.
func (f *federator) DefaultCallback(ctx context.Context, activity pub.Activity) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "DefaultCallback",
- "aptype": activity.GetTypeName(),
- })
+ l := log.WithFields(kv.Fields{
+ {"aptype", activity.GetTypeName()},
+ }...)
l.Debugf("received unhandle-able activity type so ignoring it")
return nil
}
diff --git a/internal/log/caller.go b/internal/log/caller.go
new file mode 100644
index 000000000..f7062f06a
--- /dev/null
+++ b/internal/log/caller.go
@@ -0,0 +1,89 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package log
+
+import (
+ "runtime"
+ "strings"
+ "sync"
+)
+
+var (
+ // fnCache is a cache of PCs to their calculated function names.
+ fnCache = map[uintptr]string{}
+
+ // strCache is a cache of strings to the originally allocated version
+ // of that string contents. so we don't have hundreds of the same instances
+ // of string floating around in memory.
+ strCache = map[string]string{}
+
+ // cacheMu protects fnCache and strCache.
+ cacheMu sync.Mutex
+)
+
+// Caller fetches the calling function name, skipping 'depth'. Results are cached per PC.
+func Caller(depth int) string {
+ var rpc [1]uintptr
+
+ // Fetch pcs of callers
+ n := runtime.Callers(depth, rpc[:])
+
+ if n > 0 {
+ // Look for value in cache
+ cacheMu.Lock()
+ fn, ok := fnCache[rpc[0]]
+ cacheMu.Unlock()
+
+ if ok {
+ return fn
+ }
+
+ // Fetch frame info for caller pc
+ frame, _ := runtime.CallersFrames(rpc[:]).Next()
+
+ if frame.PC != 0 {
+ name := frame.Function
+
+ // Drop all but the package name and function name, no mod path
+ if idx := strings.LastIndex(name, "/"); idx >= 0 {
+ name = name[idx+1:]
+ }
+
+ // Drop any generic type parameter markers
+ if idx := strings.Index(name, "[...]"); idx >= 0 {
+ name = name[:idx] + name[idx+5:]
+ }
+
+ // Cache this func name
+ cacheMu.Lock()
+ fn, ok := strCache[name]
+ if !ok {
+ // Cache ptr to this allocated str
+ strCache[name] = name
+ fn = name
+ }
+ fnCache[rpc[0]] = fn
+ cacheMu.Unlock()
+
+ return fn
+ }
+ }
+
+ return "???"
+}
diff --git a/internal/log/caller_test.go b/internal/log/caller_test.go
new file mode 100644
index 000000000..59bf342d1
--- /dev/null
+++ b/internal/log/caller_test.go
@@ -0,0 +1,54 @@
+package log_test
+
+import (
+ "runtime"
+ "strings"
+ "testing"
+
+ "codeberg.org/gruf/go-atomics"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
+)
+
+// noopt exists to prevent certain optimisations during benching.
+var noopt = atomics.NewString()
+
+func BenchmarkCaller(b *testing.B) {
+ b.RunParallel(func(pb *testing.PB) {
+ for pb.Next() {
+ name := log.Caller(2)
+ noopt.Store(name)
+ }
+ })
+}
+
+func BenchmarkCallerNoCache(b *testing.B) {
+ b.RunParallel(func(pb *testing.PB) {
+ for pb.Next() {
+ var rpc [1]uintptr
+
+ // Fetch pcs of callers
+ n := runtime.Callers(2, rpc[:])
+
+ if n > 0 {
+ // Fetch frame info for caller pc
+ frame, _ := runtime.CallersFrames(rpc[:]).Next()
+
+ if frame.PC != 0 {
+ name := frame.Function
+
+ // Drop all but the package name and function name, no mod path
+ if idx := strings.LastIndex(name, "/"); idx >= 0 {
+ name = name[idx+1:]
+ }
+
+ // Drop any generic type parameter markers
+ if idx := strings.Index(name, "[...]"); idx >= 0 {
+ name = name[:idx] + name[idx+5:]
+ }
+
+ noopt.Store(name)
+ }
+ }
+ }
+ })
+}
diff --git a/internal/log/entry.go b/internal/log/entry.go
new file mode 100644
index 000000000..2e6f62e96
--- /dev/null
+++ b/internal/log/entry.go
@@ -0,0 +1,117 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package log
+
+import (
+ "fmt"
+ "syscall"
+
+ "codeberg.org/gruf/go-kv"
+ "codeberg.org/gruf/go-logger/v2/level"
+)
+
+type Entry struct {
+ fields []kv.Field
+}
+
+func (e Entry) WithField(key string, value interface{}) Entry {
+ e.fields = append(e.fields, kv.Field{K: key, V: value})
+ return e
+}
+
+func (e Entry) WithFields(fields ...kv.Field) Entry {
+ e.fields = append(e.fields, fields...)
+ return e
+}
+
+func (e Entry) Trace(a ...interface{}) {
+ logf(level.TRACE, e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Tracef(s string, a ...interface{}) {
+ logf(level.TRACE, e.fields, s, a...)
+}
+
+func (e Entry) Debug(a ...interface{}) {
+ logf(level.DEBUG, e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Debugf(s string, a ...interface{}) {
+ logf(level.DEBUG, e.fields, s, a...)
+}
+
+func (e Entry) Info(a ...interface{}) {
+ logf(level.INFO, e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Infof(s string, a ...interface{}) {
+ logf(level.INFO, e.fields, s, a...)
+}
+
+func (e Entry) Warn(a ...interface{}) {
+ logf(level.WARN, e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Warnf(s string, a ...interface{}) {
+ logf(level.WARN, e.fields, s, a...)
+}
+
+func (e Entry) Error(a ...interface{}) {
+ logf(level.ERROR, e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Errorf(s string, a ...interface{}) {
+ logf(level.ERROR, e.fields, s, a...)
+}
+
+func (e Entry) Fatal(a ...interface{}) {
+ defer syscall.Exit(1)
+ logf(level.FATAL, e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Fatalf(s string, a ...interface{}) {
+ defer syscall.Exit(1)
+ logf(level.FATAL, e.fields, s, a...)
+}
+
+func (e Entry) Panic(a ...interface{}) {
+ defer panic(fmt.Sprint(a...))
+ logf(level.PANIC, e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Panicf(s string, a ...interface{}) {
+ defer panic(fmt.Sprintf(s, a...))
+ logf(level.PANIC, e.fields, s, a...)
+}
+
+func (e Entry) Log(lvl level.LEVEL, a ...interface{}) {
+ logf(lvl, e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Logf(lvl level.LEVEL, s string, a ...interface{}) {
+ logf(lvl, e.fields, s, a...)
+}
+
+func (e Entry) Print(a ...interface{}) {
+ printf(e.fields, args(len(a)), a...)
+}
+
+func (e Entry) Printf(s string, a ...interface{}) {
+ printf(e.fields, s, a...)
+}
diff --git a/internal/log/init.go b/internal/log/init.go
new file mode 100644
index 000000000..9ec790ba2
--- /dev/null
+++ b/internal/log/init.go
@@ -0,0 +1,62 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package log
+
+import (
+ "fmt"
+ "log/syslog"
+ "strings"
+
+ "codeberg.org/gruf/go-logger/v2/level"
+)
+
+// ParseLevel will parse the log level from given string and set to appropriate level.
+func ParseLevel(str string) error {
+ switch strings.ToLower(str) {
+ case "trace":
+ SetLevel(level.TRACE)
+ case "debug":
+ SetLevel(level.DEBUG)
+ case "", "info":
+ SetLevel(level.INFO)
+ case "warn":
+ SetLevel(level.WARN)
+ case "error":
+ SetLevel(level.ERROR)
+ case "fatal":
+ SetLevel(level.FATAL)
+ default:
+ return fmt.Errorf("unknown log level: %q", str)
+ }
+ return nil
+}
+
+// EnableSyslog will enabling logging to the syslog at given address.
+func EnableSyslog(proto, addr string) error {
+ // Dial a connection to the syslog daemon
+ writer, err := syslog.Dial(proto, addr, 0, "gotosocial")
+ if err != nil {
+ return err
+ }
+
+ // Set the syslog writer
+ sysout = writer
+
+ return nil
+}
diff --git a/internal/log/log.go b/internal/log/log.go
index 67dd03606..a9c7340ed 100644
--- a/internal/log/log.go
+++ b/internal/log/log.go
@@ -19,95 +19,259 @@
package log
import (
- "bytes"
+ "fmt"
"io"
"log/syslog"
"os"
+ "strings"
+ "syscall"
+ "time"
- "github.com/sirupsen/logrus"
- lSyslog "github.com/sirupsen/logrus/hooks/syslog"
- "github.com/superseriousbusiness/gotosocial/internal/config"
+ "codeberg.org/gruf/go-atomics"
+ "codeberg.org/gruf/go-kv"
+ "codeberg.org/gruf/go-logger/v2/level"
)
-// Initialize initializes the global Logrus logger, reading the desired
-// log level from the viper store, or using a default if the level
-// has not been set in viper.
-//
-// It also sets the output to log.SplitErrOutputs(...)
-// so you get error logs on stderr and normal logs on stdout.
-//
-// If syslog settings are also in viper, then Syslog will be initialized as well.
-func Initialize() error {
- out := SplitErrOutputs(os.Stdout, os.Stderr)
- logrus.SetOutput(out)
+var (
+ // loglvl is the currently set logging level.
+ loglvl atomics.Uint32
- // check if a desired log level has been set
- if lvl := config.GetLogLevel(); lvl != "" {
- level, err := logrus.ParseLevel(lvl)
- if err != nil {
- return err
- }
- logrus.SetLevel(level)
+ // lvlstrs is the lookup table of log levels to strings.
+ lvlstrs = level.Default()
- if level == logrus.TraceLevel {
- logrus.SetReportCaller(true)
- }
- }
+ // Preprepared stdout/stderr log writers.
+ stdout = &safewriter{w: os.Stdout}
+ stderr = &safewriter{w: os.Stderr}
- // set our custom formatter options
- logrus.SetFormatter(&logrus.TextFormatter{
- DisableColors: true,
- FullTimestamp: true,
+ // Syslog output, only set if enabled.
+ sysout *syslog.Writer
+)
- // By default, quoting is enabled to help differentiate key-value
- // fields in log lines. But when debug (or higher, e.g. trace) logging
- // is enabled, we disable this. This allows easier copy-pasting of
- // entry fields without worrying about escaped quotes.
- DisableQuote: logrus.GetLevel() >= logrus.DebugLevel,
- })
-
- // check if syslog has been enabled, and configure it if so
- if config.GetSyslogEnabled() {
- protocol := config.GetSyslogProtocol()
- address := config.GetSyslogAddress()
-
- hook, err := lSyslog.NewSyslogHook(protocol, address, syslog.LOG_INFO, "")
- if err != nil {
- return err
- }
-
- logrus.AddHook(&trimHook{hook})
- }
-
- return nil
+// Level returns the currently set log level.
+func Level() level.LEVEL {
+ return level.LEVEL(loglvl.Load())
}
-// SplitErrOutputs returns an OutputSplitFunc that splits output to either one of
-// two given outputs depending on whether the level is "error","fatal","panic".
-func SplitErrOutputs(out, err io.Writer) OutputSplitFunc {
- return func(lvl []byte) io.Writer {
- switch string(lvl) /* convert to str for compare is no-alloc */ {
- case "error", "fatal", "panic":
- return err
- default:
- return out
- }
+// SetLevel sets the max logging level.
+func SetLevel(lvl level.LEVEL) {
+ loglvl.Store(uint32(lvl))
+}
+
+func WithField(key string, value interface{}) Entry {
+ return Entry{fields: []kv.Field{{K: key, V: value}}}
+}
+
+func WithFields(fields ...kv.Field) Entry {
+ return Entry{fields: fields}
+}
+
+func Trace(a ...interface{}) {
+ logf(level.TRACE, nil, args(len(a)), a...)
+}
+
+func Tracef(s string, a ...interface{}) {
+ logf(level.TRACE, nil, s, a...)
+}
+
+func Debug(a ...interface{}) {
+ logf(level.DEBUG, nil, args(len(a)), a...)
+}
+
+func Debugf(s string, a ...interface{}) {
+ logf(level.DEBUG, nil, s, a...)
+}
+
+func Info(a ...interface{}) {
+ logf(level.INFO, nil, args(len(a)), a...)
+}
+
+func Infof(s string, a ...interface{}) {
+ logf(level.INFO, nil, s, a...)
+}
+
+func Warn(a ...interface{}) {
+ logf(level.WARN, nil, args(len(a)), a...)
+}
+
+func Warnf(s string, a ...interface{}) {
+ logf(level.WARN, nil, s, a...)
+}
+
+func Error(a ...interface{}) {
+ logf(level.ERROR, nil, args(len(a)), a...)
+}
+
+func Errorf(s string, a ...interface{}) {
+ logf(level.ERROR, nil, s, a...)
+}
+
+func Fatal(a ...interface{}) {
+ defer syscall.Exit(1)
+ logf(level.FATAL, nil, args(len(a)), a...)
+}
+
+func Fatalf(s string, a ...interface{}) {
+ defer syscall.Exit(1)
+ logf(level.FATAL, nil, s, a...)
+}
+
+func Panic(a ...interface{}) {
+ defer panic(fmt.Sprint(a...))
+ logf(level.PANIC, nil, args(len(a)), a...)
+}
+
+func Panicf(s string, a ...interface{}) {
+ defer panic(fmt.Sprintf(s, a...))
+ logf(level.PANIC, nil, s, a...)
+}
+
+// Log will log formatted args as 'msg' field to the log at given level.
+func Log(lvl level.LEVEL, a ...interface{}) {
+ logf(lvl, nil, args(len(a)), a...)
+}
+
+// Logf will log format string as 'msg' field to the log at given level.
+func Logf(lvl level.LEVEL, s string, a ...interface{}) {
+ logf(lvl, nil, s, a...)
+}
+
+// Print will log formatted args to the stdout log output.
+func Print(a ...interface{}) {
+ printf(nil, args(len(a)), a...)
+}
+
+// Print will log format string to the stdout log output.
+func Printf(s string, a ...interface{}) {
+ printf(nil, s, a...)
+}
+
+func printf(fields []kv.Field, s string, a ...interface{}) {
+ // Acquire buffer
+ buf := getBuf()
+
+ // Append formatted timestamp
+ now := time.Now().Format("02/01/2006 15:04:05.000")
+ buf.B = append(buf.B, `timestamp="`...)
+ buf.B = append(buf.B, now...)
+ buf.B = append(buf.B, `" `...)
+
+ // Append formatted caller func
+ buf.B = append(buf.B, `func=`...)
+ buf.B = append(buf.B, Caller(4)...)
+ buf.B = append(buf.B, ' ')
+
+ if len(fields) > 0 {
+ // Append formatted fields
+ kv.Fields(fields).AppendFormat(buf, false)
+ buf.B = append(buf.B, ' ')
+ }
+
+ // Append formatted args
+ fmt.Fprintf(buf, s, a...)
+
+ // Append a final newline
+ buf.B = append(buf.B, '\n')
+
+ // Write to log and release
+ _, _ = stdout.Write(buf.B)
+ putBuf(buf)
+}
+
+func logf(lvl level.LEVEL, fields []kv.Field, s string, a ...interface{}) {
+ var out io.Writer
+
+ // Check if enabled.
+ if lvl > Level() {
+ return
+ }
+
+ // Split errors to stderr,
+ // all else goes to stdout.
+ if lvl <= level.ERROR {
+ out = stderr
+ } else {
+ out = stdout
+ }
+
+ // Acquire buffer
+ buf := getBuf()
+
+ // Append formatted timestamp
+ now := time.Now().Format("02/01/2006 15:04:05.000")
+ buf.B = append(buf.B, `timestamp="`...)
+ buf.B = append(buf.B, now...)
+ buf.B = append(buf.B, `" `...)
+
+ // Append formatted caller func
+ buf.B = append(buf.B, `func=`...)
+ buf.B = append(buf.B, Caller(4)...)
+ buf.B = append(buf.B, ' ')
+
+ // Append formatted level string
+ buf.B = append(buf.B, `level=`...)
+ buf.B = append(buf.B, lvlstrs[lvl]...)
+ buf.B = append(buf.B, ' ')
+
+ // Append formatted fields with msg
+ kv.Fields(append(fields, kv.Field{
+ "msg", fmt.Sprintf(s, a...),
+ })).AppendFormat(buf, false)
+
+ // Append a final newline
+ buf.B = append(buf.B, '\n')
+
+ if sysout != nil {
+ // Write log entry to syslog
+ logsys(lvl, buf.String())
+ }
+
+ // Write to log and release
+ _, _ = out.Write(buf.B)
+ putBuf(buf)
+}
+
+// logsys will log given msg at given severity to the syslog.
+func logsys(lvl level.LEVEL, msg string) {
+ // Truncate message if > 1700 chars
+ if len(msg) > 1700 {
+ msg = msg[:1697] + "..."
+ }
+
+ // Log at appropriate syslog severity
+ switch lvl {
+ case level.TRACE:
+ case level.DEBUG:
+ case level.INFO:
+ _ = sysout.Info(msg)
+ case level.WARN:
+ _ = sysout.Warning(msg)
+ case level.ERROR:
+ _ = sysout.Err(msg)
+ case level.FATAL:
+ _ = sysout.Crit(msg)
}
}
-// OutputSplitFunc implements the io.Writer interface for use with Logrus, and simply
-// splits logs between stdout and stderr depending on their severity.
-type OutputSplitFunc func(lvl []byte) io.Writer
+// args returns an args format string of format '%v' * count.
+func args(count int) string {
+ const args = `%v%v%v%v%v%v%v%v%v%v` +
+ `%v%v%v%v%v%v%v%v%v%v` +
+ `%v%v%v%v%v%v%v%v%v%v` +
+ `%v%v%v%v%v%v%v%v%v%v`
-var levelBytes = []byte("level=")
-
-func (fn OutputSplitFunc) Write(b []byte) (int, error) {
- var lvl []byte
- if i := bytes.Index(b, levelBytes); i >= 0 {
- blvl := b[i+len(levelBytes):]
- if i := bytes.IndexByte(blvl, ' '); i >= 0 {
- lvl = blvl[:i]
- }
+ // Use predetermined args str
+ if count < len(args) {
+ return args[:count*2]
}
- return fn(lvl).Write(b)
+
+ // Allocate buffer of needed len
+ var buf strings.Builder
+ buf.Grow(count * 2)
+
+ // Manually build an args str
+ for i := 0; i < count; i++ {
+ buf.WriteString(`%v`)
+ }
+
+ return buf.String()
}
diff --git a/internal/log/log_test.go b/internal/log/log_test.go
deleted file mode 100644
index 01aae73ae..000000000
--- a/internal/log/log_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- GoToSocial
- Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-*/
-
-package log_test
-
-import (
- "bytes"
- "testing"
-
- "github.com/sirupsen/logrus"
- "github.com/superseriousbusiness/gotosocial/internal/log"
-)
-
-func TestOutputSplitFunc(t *testing.T) {
- var outbuf, errbuf bytes.Buffer
-
- out := log.SplitErrOutputs(&outbuf, &errbuf)
-
- log := logrus.New()
- log.SetOutput(out)
- log.SetLevel(logrus.TraceLevel)
-
- for _, lvl := range logrus.AllLevels {
- func() {
- defer func() { recover() }()
- log.Log(lvl, "hello world")
- }()
-
- t.Logf("outbuf=%q errbuf=%q", outbuf.String(), errbuf.String())
-
- switch lvl {
- case logrus.PanicLevel:
- if outbuf.Len() > 0 || errbuf.Len() == 0 {
- t.Error("expected panic to log to OutputSplitter.Err")
- }
- case logrus.FatalLevel:
- if outbuf.Len() > 0 || errbuf.Len() == 0 {
- t.Error("expected fatal to log to OutputSplitter.Err")
- }
- case logrus.ErrorLevel:
- if outbuf.Len() > 0 || errbuf.Len() == 0 {
- t.Error("expected error to log to OutputSplitter.Err")
- }
- default:
- if outbuf.Len() == 0 || errbuf.Len() > 0 {
- t.Errorf("expected %s to log to OutputSplitter.Out", lvl)
- }
- }
-
- // Reset buffers
- outbuf.Reset()
- errbuf.Reset()
- }
-}
diff --git a/internal/log/pool.go b/internal/log/pool.go
new file mode 100644
index 000000000..cb2edfbea
--- /dev/null
+++ b/internal/log/pool.go
@@ -0,0 +1,49 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package log
+
+import (
+ "sync"
+
+ "codeberg.org/gruf/go-byteutil"
+)
+
+// bufPool provides a memory pool of log buffers.
+var bufPool = sync.Pool{
+ New: func() any {
+ return &byteutil.Buffer{
+ B: make([]byte, 0, 512),
+ }
+ },
+}
+
+// getBuf acquires a buffer from memory pool.
+func getBuf() *byteutil.Buffer {
+ buf, _ := bufPool.Get().(*byteutil.Buffer)
+ return buf
+}
+
+// putBuf places (after resetting) buffer back in memory pool, dropping if capacity too large.
+func putBuf(buf *byteutil.Buffer) {
+ if buf.Cap() > int(^uint16(0)) {
+ return // drop large buffer
+ }
+ buf.Reset()
+ bufPool.Put(buf)
+}
diff --git a/internal/log/syslog_test.go b/internal/log/syslog_test.go
index d58dfdcba..aafa93419 100644
--- a/internal/log/syslog_test.go
+++ b/internal/log/syslog_test.go
@@ -19,15 +19,16 @@
package log_test
import (
+ "fmt"
"os"
"path"
"regexp"
"testing"
"github.com/google/uuid"
- "github.com/sirupsen/logrus"
"github.com/stretchr/testify/suite"
"github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/testrig"
"gopkg.in/mcuadros/go-syslog.v2"
"gopkg.in/mcuadros/go-syslog.v2/format"
@@ -65,17 +66,21 @@ func (suite *SyslogTestSuite) TearDownTest() {
}
func (suite *SyslogTestSuite) TestSyslog() {
- logrus.Warn("this is a test of the emergency broadcast system!")
+ log.Info("this is a test of the emergency broadcast system!")
entry := <-suite.syslogChannel
- suite.Regexp(regexp.MustCompile(`time=.* msg=this is a test of the emergency broadcast system! func=.*`), entry["content"])
+ suite.Regexp(regexp.MustCompile(`timestamp=.* func=.* level=INFO msg="this is a test of the emergency broadcast system!"`), entry["content"])
}
func (suite *SyslogTestSuite) TestSyslogLongMessage() {
- logrus.Warn(longMessage)
+ log.Warn(longMessage)
+
+ funcName := log.Caller(2)
+ prefix := fmt.Sprintf(`timestamp="02/01/2006 15:04:05.000" func=%s level=WARN msg="`, funcName)
entry := <-suite.syslogChannel
- suite.Regexp(regexp.MustCompile(`time=.* msg=condimentum lacinia quis vel eros donec ac odio tempor orci dapibus ultrices in iaculis nunc sed augue lacus viverra vitae congue eu consequat ac felis donec et odio pellentesque diam volutpat commodo sed egestas egestas fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate sapien nec sagittis aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed velit dignissim sodales ut eu sem integer vitae justo eget magna fermentum iaculis eu non diam phasellus vestibulum lorem sed risus ultricies tristique nulla aliquet enim tortor at auctor urna nunc id cursus metus aliquam eleifend mi in nulla posuere sollicitudin aliquam ultrices sagittis orci a scelerisque purus semper eget duis at tellus at urna condimentum mattis pellentesque id nibh tortor id aliquet lectus proin nibh nisl condimentum id venenatis a condimentum vitae sapien pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas sed tempus urna et pharetra pharetra massa massa ultricies mi quis hendrerit dolor magna eget est lorem ipsum dolor sit amet consectetur adipiscing elit pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas integer eget aliquet nibh praesent tristique magna sit amet purus gravida quis blandit turpis cursus in hac habitasse platea dictumst quisque sagittis purus sit amet volutpat consequat mauris nunc congue nisi vitae suscipit tellus mauris a diam maecenas sed enim ut sem viverra aliquet eget sit amet tellus cras adipiscing enim eu turpis egestas pretium aenean pharetra magna ac placerat vestibulum lectus mauris ultrices eros in cursus turpis massa tincidunt dui ut ornare lectus sit a\.\.\. func=.*`), entry["content"])
+ regex := fmt.Sprintf(`timestamp=.* func=.* level=WARN msg="%s\.\.\.`, longMessage[:1700-len(prefix)-3])
+ suite.Regexp(regexp.MustCompile(regex), entry["content"])
}
func (suite *SyslogTestSuite) TestSyslogLongMessageUnixgram() {
@@ -99,10 +104,15 @@ func (suite *SyslogTestSuite) TestSyslogLongMessageUnixgram() {
testrig.InitTestLog()
- logrus.Warn(longMessage)
+ log.Warn(longMessage)
+
+ funcName := log.Caller(2)
+ prefix := fmt.Sprintf(`timestamp="02/01/2006 15:04:05.000" func=%s level=WARN msg="`, funcName)
entry := <-syslogChannel
- suite.Regexp(regexp.MustCompile(`time=.* msg=condimentum lacinia quis vel eros donec ac odio tempor orci dapibus ultrices in iaculis nunc sed augue lacus viverra vitae congue eu consequat ac felis donec et odio pellentesque diam volutpat commodo sed egestas egestas fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate sapien nec sagittis aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed velit dignissim sodales ut eu sem integer vitae justo eget magna fermentum iaculis eu non diam phasellus vestibulum lorem sed risus ultricies tristique nulla aliquet enim tortor at auctor urna nunc id cursus metus aliquam eleifend mi in nulla posuere sollicitudin aliquam ultrices sagittis orci a scelerisque purus semper eget duis at tellus at urna condimentum mattis pellentesque id nibh tortor id aliquet lectus proin nibh nisl condimentum id venenatis a condimentum vitae sapien pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas sed tempus urna et pharetra pharetra massa massa ultricies mi quis hendrerit dolor magna eget est lorem ipsum dolor sit amet consectetur adipiscing elit pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas integer eget aliquet nibh praesent tristique magna sit amet purus gravida quis blandit turpis cursus in hac habitasse platea dictumst quisque sagittis purus sit amet volutpat consequat mauris nunc congue nisi vitae suscipit tellus mauris a diam maecenas sed enim ut sem viverra aliquet eget sit amet tellus cras adipiscing enim eu turpis egestas pretium aenean pharetra magna ac placerat vestibulum lectus mauris ultrices eros in cursus turpis massa tincidunt dui ut ornare lectus sit a\.\.\. func=.*`), entry["content"])
+ regex := fmt.Sprintf(`timestamp=.* func=.* level=WARN msg="%s\.\.\.`, longMessage[:1700-len(prefix)-3])
+
+ suite.Regexp(regexp.MustCompile(regex), entry["content"])
if err := syslogServer.Kill(); err != nil {
panic(err)
diff --git a/internal/log/trimhook.go b/internal/log/trimhook.go
deleted file mode 100644
index c9faccb90..000000000
--- a/internal/log/trimhook.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- GoToSocial
- Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-*/
-
-package log
-
-import (
- "github.com/sirupsen/logrus"
-)
-
-// trimHook is a wrapper round a logrus hook that trims the *entry.Message
-// to no more than 1700 characters before sending it through to the wrapped hook,
-// to avoid spamming syslog with messages that are too long for it.
-type trimHook struct {
- wrappedHook logrus.Hook
-}
-
-func (t *trimHook) Fire(e *logrus.Entry) error {
- // only copy/truncate if we need to
- if len(e.Message) < 1700 {
- return t.wrappedHook.Fire(e)
- }
-
- // it's too long, truncate + fire a copy of the entry so we don't meddle with the original
- return t.wrappedHook.Fire(&logrus.Entry{
- Logger: e.Logger,
- Data: e.Data,
- Time: e.Time,
- Level: e.Level,
- Caller: e.Caller,
- Message: e.Message[:1696] + "...", // truncate
- Buffer: e.Buffer,
- Context: e.Context,
- })
-}
-
-func (t *trimHook) Levels() []logrus.Level {
- return t.wrappedHook.Levels()
-}
diff --git a/internal/log/writer.go b/internal/log/writer.go
new file mode 100644
index 000000000..4356d9b7d
--- /dev/null
+++ b/internal/log/writer.go
@@ -0,0 +1,37 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package log
+
+import (
+ "io"
+ "sync"
+)
+
+// safewriter wraps a writer to provide mutex safety on write.
+type safewriter struct {
+ w io.Writer
+ m sync.Mutex
+}
+
+func (w *safewriter) Write(b []byte) (int, error) {
+ w.m.Lock()
+ n, err := w.w.Write(b)
+ w.m.Unlock()
+ return n, err
+}
diff --git a/internal/media/manager.go b/internal/media/manager.go
index b14288324..828aa033b 100644
--- a/internal/media/manager.go
+++ b/internal/media/manager.go
@@ -24,10 +24,10 @@ import (
"time"
"github.com/robfig/cron/v3"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/concurrency"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/storage"
)
@@ -210,10 +210,10 @@ func scheduleCleanupJobs(m *manager) error {
begin := time.Now()
pruned, err := m.PruneAllMeta(pruneCtx)
if err != nil {
- logrus.Errorf("media manager: error pruning meta: %s", err)
+ log.Errorf("media manager: error pruning meta: %s", err)
return
}
- logrus.Infof("media manager: pruned %d meta entries in %s", pruned, time.Since(begin))
+ log.Infof("media manager: pruned %d meta entries in %s", pruned, time.Since(begin))
}); err != nil {
pruneCancel()
return fmt.Errorf("error starting media manager meta cleanup job: %s", err)
@@ -223,10 +223,10 @@ func scheduleCleanupJobs(m *manager) error {
begin := time.Now()
pruned, err := m.PruneUnusedLocalAttachments(pruneCtx)
if err != nil {
- logrus.Errorf("media manager: error pruning unused local attachments: %s", err)
+ log.Errorf("media manager: error pruning unused local attachments: %s", err)
return
}
- logrus.Infof("media manager: pruned %d unused local attachments in %s", pruned, time.Since(begin))
+ log.Infof("media manager: pruned %d unused local attachments in %s", pruned, time.Since(begin))
}); err != nil {
pruneCancel()
return fmt.Errorf("error starting media manager unused local attachments cleanup job: %s", err)
@@ -238,10 +238,10 @@ func scheduleCleanupJobs(m *manager) error {
begin := time.Now()
pruned, err := m.PruneAllRemote(pruneCtx, mediaRemoteCacheDays)
if err != nil {
- logrus.Errorf("media manager: error pruning remote cache: %s", err)
+ log.Errorf("media manager: error pruning remote cache: %s", err)
return
}
- logrus.Infof("media manager: pruned %d remote cache entries in %s", pruned, time.Since(begin))
+ log.Infof("media manager: pruned %d remote cache entries in %s", pruned, time.Since(begin))
}); err != nil {
pruneCancel()
return fmt.Errorf("error starting media manager remote cache cleanup job: %s", err)
@@ -254,9 +254,9 @@ func scheduleCleanupJobs(m *manager) error {
select {
case <-cronCtx.Done():
- logrus.Infof("media manager: cron finished jobs and stopped gracefully")
+ log.Infof("media manager: cron finished jobs and stopped gracefully")
case <-time.After(1 * time.Minute):
- logrus.Infof("media manager: cron didn't stop after 60 seconds, will force close jobs")
+ log.Infof("media manager: cron didn't stop after 60 seconds, will force close jobs")
break
}
diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go
index ffac56052..b28dc7f02 100644
--- a/internal/media/processingemoji.go
+++ b/internal/media/processingemoji.go
@@ -28,9 +28,9 @@ import (
"sync/atomic"
"time"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/storage"
"github.com/superseriousbusiness/gotosocial/internal/uris"
)
@@ -174,7 +174,7 @@ func (p *ProcessingEmoji) store(ctx context.Context) error {
defer func() {
if rc, ok := reader.(io.ReadCloser); ok {
if err := rc.Close(); err != nil {
- logrus.Errorf("store: error closing readcloser: %s", err)
+ log.Errorf("store: error closing readcloser: %s", err)
}
}
}()
diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go
index 17fddddb7..885e97417 100644
--- a/internal/media/processingmedia.go
+++ b/internal/media/processingmedia.go
@@ -28,11 +28,11 @@ import (
"sync/atomic"
"time"
- "github.com/sirupsen/logrus"
terminator "github.com/superseriousbusiness/exif-terminator"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/storage"
"github.com/superseriousbusiness/gotosocial/internal/uris"
)
@@ -80,10 +80,10 @@ func (p *ProcessingMedia) AttachmentID() string {
// LoadAttachment blocks until the thumbnail and fullsize content
// has been processed, and then returns the completed attachment.
func (p *ProcessingMedia) LoadAttachment(ctx context.Context) (*gtsmodel.MediaAttachment, error) {
- logrus.Tracef("LoadAttachment: getting lock for attachment %s", p.attachment.URL)
+ log.Tracef("LoadAttachment: getting lock for attachment %s", p.attachment.URL)
p.mu.Lock()
defer p.mu.Unlock()
- logrus.Tracef("LoadAttachment: got lock for attachment %s", p.attachment.URL)
+ log.Tracef("LoadAttachment: got lock for attachment %s", p.attachment.URL)
if err := p.store(ctx); err != nil {
return nil, err
@@ -113,7 +113,7 @@ func (p *ProcessingMedia) LoadAttachment(ctx context.Context) (*gtsmodel.MediaAt
p.insertedInDB = true
}
- logrus.Tracef("LoadAttachment: finished, returning attachment %s", p.attachment.URL)
+ log.Tracef("LoadAttachment: finished, returning attachment %s", p.attachment.URL)
return p.attachment, nil
}
@@ -137,7 +137,7 @@ func (p *ProcessingMedia) loadThumb(ctx context.Context) error {
}
// stream the original file out of storage
- logrus.Tracef("loadThumb: fetching attachment from storage %s", p.attachment.URL)
+ log.Tracef("loadThumb: fetching attachment from storage %s", p.attachment.URL)
stored, err := p.storage.GetStream(ctx, p.attachment.File.Path)
if err != nil {
p.err = fmt.Errorf("loadThumb: error fetching file from storage: %s", err)
@@ -147,14 +147,14 @@ func (p *ProcessingMedia) loadThumb(ctx context.Context) error {
// whatever happens, close the stream when we're done
defer func() {
- logrus.Tracef("loadThumb: closing stored stream %s", p.attachment.URL)
+ log.Tracef("loadThumb: closing stored stream %s", p.attachment.URL)
if err := stored.Close(); err != nil {
- logrus.Errorf("loadThumb: error closing stored full size: %s", err)
+ log.Errorf("loadThumb: error closing stored full size: %s", err)
}
}()
// stream the file from storage straight into the derive thumbnail function
- logrus.Tracef("loadThumb: calling deriveThumbnail %s", p.attachment.URL)
+ log.Tracef("loadThumb: calling deriveThumbnail %s", p.attachment.URL)
thumb, err := deriveThumbnail(stored, p.attachment.File.ContentType, createBlurhash)
if err != nil {
p.err = fmt.Errorf("loadThumb: error deriving thumbnail: %s", err)
@@ -163,7 +163,7 @@ func (p *ProcessingMedia) loadThumb(ctx context.Context) error {
}
// put the thumbnail in storage
- logrus.Tracef("loadThumb: storing new thumbnail %s", p.attachment.URL)
+ log.Tracef("loadThumb: storing new thumbnail %s", p.attachment.URL)
if err := p.storage.Put(ctx, p.attachment.Thumbnail.Path, thumb.small); err != nil {
p.err = fmt.Errorf("loadThumb: error storing thumbnail: %s", err)
atomic.StoreInt32(&p.thumbState, int32(errored))
@@ -184,7 +184,7 @@ func (p *ProcessingMedia) loadThumb(ctx context.Context) error {
// we're done processing the thumbnail!
atomic.StoreInt32(&p.thumbState, int32(complete))
- logrus.Tracef("loadThumb: finished processing thumbnail for attachment %s", p.attachment.URL)
+ log.Tracef("loadThumb: finished processing thumbnail for attachment %s", p.attachment.URL)
fallthrough
case complete:
return nil
@@ -245,7 +245,7 @@ func (p *ProcessingMedia) loadFullSize(ctx context.Context) error {
// we're done processing the full-size image
atomic.StoreInt32(&p.fullSizeState, int32(complete))
- logrus.Tracef("loadFullSize: finished processing full size image for attachment %s", p.attachment.URL)
+ log.Tracef("loadFullSize: finished processing full size image for attachment %s", p.attachment.URL)
fallthrough
case complete:
return nil
@@ -270,13 +270,13 @@ func (p *ProcessingMedia) store(ctx context.Context) error {
if err != nil {
return fmt.Errorf("store: error executing data function: %s", err)
}
- logrus.Tracef("store: reading %d bytes from data function for media %s", fileSize, p.attachment.URL)
+ log.Tracef("store: reading %d bytes from data function for media %s", fileSize, p.attachment.URL)
// defer closing the reader when we're done with it
defer func() {
if rc, ok := reader.(io.ReadCloser); ok {
if err := rc.Close(); err != nil {
- logrus.Errorf("store: error closing readcloser: %s", err)
+ log.Errorf("store: error closing readcloser: %s", err)
}
}
}()
@@ -330,7 +330,7 @@ func (p *ProcessingMedia) store(ctx context.Context) error {
defer func() {
if rc, ok := clean.(io.ReadCloser); ok {
if err := rc.Close(); err != nil {
- logrus.Errorf("store: error closing clean readcloser: %s", err)
+ log.Errorf("store: error closing clean readcloser: %s", err)
}
}
}()
@@ -353,7 +353,7 @@ func (p *ProcessingMedia) store(ctx context.Context) error {
return p.postData(ctx)
}
- logrus.Tracef("store: finished storing initial data for attachment %s", p.attachment.URL)
+ log.Tracef("store: finished storing initial data for attachment %s", p.attachment.URL)
return nil
}
diff --git a/internal/media/prunemeta.go b/internal/media/prunemeta.go
index 33391beaf..7b2b14f98 100644
--- a/internal/media/prunemeta.go
+++ b/internal/media/prunemeta.go
@@ -22,9 +22,9 @@ import (
"context"
"codeberg.org/gruf/go-store/storage"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (m *manager) PruneAllMeta(ctx context.Context) (int, error) {
@@ -37,7 +37,7 @@ func (m *manager) PruneAllMeta(ctx context.Context) (int, error) {
for attachments, err = m.db.GetAvatarsAndHeaders(ctx, maxID, selectPruneLimit); err == nil && len(attachments) != 0; attachments, err = m.db.GetAvatarsAndHeaders(ctx, maxID, selectPruneLimit) {
// use the id of the last attachment in the slice as the next 'maxID' value
l := len(attachments)
- logrus.Tracef("PruneAllMeta: got %d attachments with maxID < %s", l, maxID)
+ log.Tracef("PruneAllMeta: got %d attachments with maxID < %s", l, maxID)
maxID = attachments[l-1].ID
// prune each attachment that meets one of the following criteria:
@@ -61,14 +61,14 @@ func (m *manager) PruneAllMeta(ctx context.Context) (int, error) {
return totalPruned, err
}
- logrus.Infof("PruneAllMeta: finished pruning avatars + headers: pruned %d entries", totalPruned)
+ log.Infof("PruneAllMeta: finished pruning avatars + headers: pruned %d entries", totalPruned)
return totalPruned, nil
}
func (m *manager) pruneOneAvatarOrHeader(ctx context.Context, attachment *gtsmodel.MediaAttachment) error {
if attachment.File.Path != "" {
// delete the full size attachment from storage
- logrus.Tracef("pruneOneAvatarOrHeader: deleting %s", attachment.File.Path)
+ log.Tracef("pruneOneAvatarOrHeader: deleting %s", attachment.File.Path)
if err := m.storage.Delete(ctx, attachment.File.Path); err != nil && err != storage.ErrNotFound {
return err
}
@@ -76,7 +76,7 @@ func (m *manager) pruneOneAvatarOrHeader(ctx context.Context, attachment *gtsmod
if attachment.Thumbnail.Path != "" {
// delete the thumbnail from storage
- logrus.Tracef("pruneOneAvatarOrHeader: deleting %s", attachment.Thumbnail.Path)
+ log.Tracef("pruneOneAvatarOrHeader: deleting %s", attachment.Thumbnail.Path)
if err := m.storage.Delete(ctx, attachment.Thumbnail.Path); err != nil && err != storage.ErrNotFound {
return err
}
diff --git a/internal/media/prunemeta_test.go b/internal/media/prunemeta_test.go
index 8b250e7a5..b02156587 100644
--- a/internal/media/prunemeta_test.go
+++ b/internal/media/prunemeta_test.go
@@ -85,6 +85,7 @@ func (suite *PruneMetaTestSuite) TestPruneMetaTwice() {
suite.NoError(err)
suite.Equal(0, totalPruned)
}
+
func (suite *PruneMetaTestSuite) TestPruneMetaMultipleAccounts() {
ctx := context.Background()
diff --git a/internal/media/pruneremote.go b/internal/media/pruneremote.go
index 6cad7fbf8..5c3335511 100644
--- a/internal/media/pruneremote.go
+++ b/internal/media/pruneremote.go
@@ -23,9 +23,9 @@ import (
"fmt"
"codeberg.org/gruf/go-store/storage"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (m *manager) PruneAllRemote(ctx context.Context, olderThanDays int) (int, error) {
@@ -35,14 +35,14 @@ func (m *manager) PruneAllRemote(ctx context.Context, olderThanDays int) (int, e
if err != nil {
return totalPruned, fmt.Errorf("PruneAllRemote: error parsing olderThanDays %d: %s", olderThanDays, err)
}
- logrus.Infof("PruneAllRemote: pruning media older than %s", olderThan)
+ log.Infof("PruneAllRemote: pruning media older than %s", olderThan)
// select 20 attachments at a time and prune them
for attachments, err := m.db.GetRemoteOlderThan(ctx, olderThan, selectPruneLimit); err == nil && len(attachments) != 0; attachments, err = m.db.GetRemoteOlderThan(ctx, olderThan, selectPruneLimit) {
// use the age of the oldest attachment (the last one in the slice) as the next 'older than' value
l := len(attachments)
- logrus.Tracef("PruneAllRemote: got %d attachments older than %s", l, olderThan)
+ log.Tracef("PruneAllRemote: got %d attachments older than %s", l, olderThan)
olderThan = attachments[l-1].CreatedAt
// prune each attachment
@@ -59,14 +59,14 @@ func (m *manager) PruneAllRemote(ctx context.Context, olderThanDays int) (int, e
return totalPruned, err
}
- logrus.Infof("PruneAllRemote: finished pruning remote media: pruned %d entries", totalPruned)
+ log.Infof("PruneAllRemote: finished pruning remote media: pruned %d entries", totalPruned)
return totalPruned, nil
}
func (m *manager) pruneOneRemote(ctx context.Context, attachment *gtsmodel.MediaAttachment) error {
if attachment.File.Path != "" {
// delete the full size attachment from storage
- logrus.Tracef("pruneOneRemote: deleting %s", attachment.File.Path)
+ log.Tracef("pruneOneRemote: deleting %s", attachment.File.Path)
if err := m.storage.Delete(ctx, attachment.File.Path); err != nil && err != storage.ErrNotFound {
return err
}
@@ -75,7 +75,7 @@ func (m *manager) pruneOneRemote(ctx context.Context, attachment *gtsmodel.Media
if attachment.Thumbnail.Path != "" {
// delete the thumbnail from storage
- logrus.Tracef("pruneOneRemote: deleting %s", attachment.Thumbnail.Path)
+ log.Tracef("pruneOneRemote: deleting %s", attachment.Thumbnail.Path)
if err := m.storage.Delete(ctx, attachment.Thumbnail.Path); err != nil && err != storage.ErrNotFound {
return err
}
diff --git a/internal/media/pruneunusedlocal.go b/internal/media/pruneunusedlocal.go
index 789583938..ea777428b 100644
--- a/internal/media/pruneunusedlocal.go
+++ b/internal/media/pruneunusedlocal.go
@@ -23,9 +23,9 @@ import (
"fmt"
"codeberg.org/gruf/go-store/storage"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (m *manager) PruneUnusedLocalAttachments(ctx context.Context) (int, error) {
@@ -38,14 +38,14 @@ func (m *manager) PruneUnusedLocalAttachments(ctx context.Context) (int, error)
if err != nil {
return totalPruned, fmt.Errorf("PruneUnusedLocalAttachments: error parsing olderThanDays %d: %s", UnusedLocalAttachmentCacheDays, err)
}
- logrus.Infof("PruneUnusedLocalAttachments: pruning unused local attachments older than %s", olderThan)
+ log.Infof("PruneUnusedLocalAttachments: pruning unused local attachments older than %s", olderThan)
// select 20 attachments at a time and prune them
for attachments, err = m.db.GetLocalUnattachedOlderThan(ctx, olderThan, maxID, selectPruneLimit); err == nil && len(attachments) != 0; attachments, err = m.db.GetLocalUnattachedOlderThan(ctx, olderThan, maxID, selectPruneLimit) {
// use the id of the last attachment in the slice as the next 'maxID' value
l := len(attachments)
maxID = attachments[l-1].ID
- logrus.Tracef("PruneUnusedLocalAttachments: got %d unused local attachments older than %s with maxID < %s", l, olderThan, maxID)
+ log.Tracef("PruneUnusedLocalAttachments: got %d unused local attachments older than %s with maxID < %s", l, olderThan, maxID)
for _, attachment := range attachments {
if err := m.pruneOneLocal(ctx, attachment); err != nil {
@@ -60,14 +60,14 @@ func (m *manager) PruneUnusedLocalAttachments(ctx context.Context) (int, error)
return totalPruned, err
}
- logrus.Infof("PruneUnusedLocalAttachments: finished pruning: pruned %d entries", totalPruned)
+ log.Infof("PruneUnusedLocalAttachments: finished pruning: pruned %d entries", totalPruned)
return totalPruned, nil
}
func (m *manager) pruneOneLocal(ctx context.Context, attachment *gtsmodel.MediaAttachment) error {
if attachment.File.Path != "" {
// delete the full size attachment from storage
- logrus.Tracef("pruneOneLocal: deleting %s", attachment.File.Path)
+ log.Tracef("pruneOneLocal: deleting %s", attachment.File.Path)
if err := m.storage.Delete(ctx, attachment.File.Path); err != nil && err != storage.ErrNotFound {
return err
}
@@ -75,7 +75,7 @@ func (m *manager) pruneOneLocal(ctx context.Context, attachment *gtsmodel.MediaA
if attachment.Thumbnail.Path != "" {
// delete the thumbnail from storage
- logrus.Tracef("pruneOneLocal: deleting %s", attachment.Thumbnail.Path)
+ log.Tracef("pruneOneLocal: deleting %s", attachment.Thumbnail.Path)
if err := m.storage.Delete(ctx, attachment.Thumbnail.Path); err != nil && err != storage.ErrNotFound {
return err
}
diff --git a/internal/media/util.go b/internal/media/util.go
index 9d62619f5..aea2ad990 100644
--- a/internal/media/util.go
+++ b/internal/media/util.go
@@ -24,7 +24,7 @@ import (
"time"
"github.com/h2non/filetype"
- "github.com/sirupsen/logrus"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// AllSupportedMIMETypes just returns all media
@@ -117,17 +117,16 @@ func ParseMediaSize(s string) (Size, error) {
}
// logrusWrapper is just a util for passing the logrus logger into the cron logging system.
-type logrusWrapper struct {
-}
+type logrusWrapper struct{}
// Info logs routine messages about cron's operation.
func (l *logrusWrapper) Info(msg string, keysAndValues ...interface{}) {
- logrus.Info("media manager cron logger: ", msg, keysAndValues)
+ log.Info("media manager cron logger: ", msg, keysAndValues)
}
// Error logs an error condition.
func (l *logrusWrapper) Error(err error, msg string, keysAndValues ...interface{}) {
- logrus.Error("media manager cron logger: ", err, msg, keysAndValues)
+ log.Error("media manager cron logger: ", err, msg, keysAndValues)
}
func parseOlderThan(olderThanDays int) (time.Time, error) {
diff --git a/internal/oauth/clientstore_test.go b/internal/oauth/clientstore_test.go
index f9c6dc4fe..1dba43c2c 100644
--- a/internal/oauth/clientstore_test.go
+++ b/internal/oauth/clientstore_test.go
@@ -37,8 +37,6 @@ type PgClientStoreTestSuite struct {
testClientUserID string
}
-const ()
-
// SetupSuite sets some variables on the suite that we can use as consts (more or less) throughout
func (suite *PgClientStoreTestSuite) SetupSuite() {
suite.testClientID = "01FCVB74EW6YBYAEY7QG9CQQF6"
diff --git a/internal/oauth/server.go b/internal/oauth/server.go
index 4dcc41ceb..d520b19ec 100644
--- a/internal/oauth/server.go
+++ b/internal/oauth/server.go
@@ -23,9 +23,9 @@ import (
"fmt"
"net/http"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/oauth2/v4"
"github.com/superseriousbusiness/oauth2/v4/errors"
"github.com/superseriousbusiness/oauth2/v4/manage"
@@ -95,12 +95,12 @@ func New(ctx context.Context, database db.Basic) Server {
srv := server.NewServer(sc, manager)
srv.SetInternalErrorHandler(func(err error) *errors.Response {
- logrus.Errorf("internal oauth error: %s", err)
+ log.Errorf("internal oauth error: %s", err)
return nil
})
srv.SetResponseErrorHandler(func(re *errors.Response) {
- logrus.Errorf("internal response error: %s", re.Error)
+ log.Errorf("internal response error: %s", re.Error)
})
srv.SetUserAuthorizationHandler(func(w http.ResponseWriter, r *http.Request) (string, error) {
@@ -155,7 +155,6 @@ func (s *s) ValidationBearerToken(r *http.Request) (oauth2.TokenInfo, error) {
// The ti parameter refers to an existing Application token that was used to make the upstream
// request. This token needs to be validated and exist in database in order to create a new token.
func (s *s) GenerateUserAccessToken(ctx context.Context, ti oauth2.TokenInfo, clientSecret string, userID string) (oauth2.TokenInfo, error) {
-
authToken, err := s.server.Manager.GenerateAuthToken(ctx, oauth2.Code, &oauth2.TokenGenerateRequest{
ClientID: ti.GetClientID(),
ClientSecret: clientSecret,
@@ -169,7 +168,7 @@ func (s *s) GenerateUserAccessToken(ctx context.Context, ti oauth2.TokenInfo, cl
if authToken == nil {
return nil, errors.New("generated auth token was empty")
}
- logrus.Tracef("obtained auth token: %+v", authToken)
+ log.Tracef("obtained auth token: %+v", authToken)
accessToken, err := s.server.Manager.GenerateAccessToken(ctx, oauth2.AuthorizationCode, &oauth2.TokenGenerateRequest{
ClientID: authToken.GetClientID(),
@@ -178,14 +177,13 @@ func (s *s) GenerateUserAccessToken(ctx context.Context, ti oauth2.TokenInfo, cl
Scope: authToken.GetScope(),
Code: authToken.GetCode(),
})
-
if err != nil {
return nil, fmt.Errorf("error generating user-level access token: %s", err)
}
if accessToken == nil {
return nil, errors.New("generated user-level access token was empty")
}
- logrus.Tracef("obtained user-level access token: %+v", accessToken)
+ log.Tracef("obtained user-level access token: %+v", accessToken)
return accessToken, nil
}
diff --git a/internal/oauth/tokenstore.go b/internal/oauth/tokenstore.go
index 5250e22b7..25946c212 100644
--- a/internal/oauth/tokenstore.go
+++ b/internal/oauth/tokenstore.go
@@ -24,10 +24,10 @@ import (
"fmt"
"time"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/oauth2/v4"
"github.com/superseriousbusiness/oauth2/v4/models"
)
@@ -53,12 +53,12 @@ func newTokenStore(ctx context.Context, db db.Basic) oauth2.TokenStore {
for {
select {
case <-ctx.Done():
- logrus.Info("breaking cleanloop")
+ log.Info("breaking cleanloop")
break cleanloop
case <-time.After(1 * time.Minute):
- logrus.Trace("sweeping out old oauth entries broom broom")
+ log.Trace("sweeping out old oauth entries broom broom")
if err := ts.sweep(ctx); err != nil {
- logrus.Errorf("error while sweeping oauth entries: %s", err)
+ log.Errorf("error while sweeping oauth entries: %s", err)
}
}
}
diff --git a/internal/oidc/handlecallback.go b/internal/oidc/handlecallback.go
index 588fb227b..ede4f51f2 100644
--- a/internal/oidc/handlecallback.go
+++ b/internal/oidc/handlecallback.go
@@ -23,34 +23,33 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (i *idp) HandleCallback(ctx context.Context, code string) (*Claims, gtserror.WithCode) {
- l := logrus.WithField("func", "HandleCallback")
if code == "" {
err := errors.New("code was empty string")
return nil, gtserror.NewErrorBadRequest(err, err.Error())
}
- l.Debug("exchanging code for oauth2token")
+ log.Debug("exchanging code for oauth2token")
oauth2Token, err := i.oauth2Config.Exchange(ctx, code)
if err != nil {
err := fmt.Errorf("error exchanging code for oauth2token: %s", err)
return nil, gtserror.NewErrorInternalError(err)
}
- l.Debug("extracting id_token")
+ log.Debug("extracting id_token")
rawIDToken, ok := oauth2Token.Extra("id_token").(string)
if !ok {
err := errors.New("no id_token in oauth2token")
return nil, gtserror.NewErrorBadRequest(err, err.Error())
}
- l.Debugf("raw id token: %s", rawIDToken)
+ log.Debugf("raw id token: %s", rawIDToken)
// Parse and verify ID Token payload.
- l.Debug("verifying id_token")
+ log.Debug("verifying id_token")
idTokenVerifier := i.provider.Verifier(i.oidcConf)
idToken, err := idTokenVerifier.Verify(ctx, rawIDToken)
if err != nil {
@@ -58,7 +57,7 @@ func (i *idp) HandleCallback(ctx context.Context, code string) (*Claims, gtserro
return nil, gtserror.NewErrorUnauthorized(err, err.Error())
}
- l.Debug("extracting claims from id_token")
+ log.Debug("extracting claims from id_token")
claims := &Claims{}
if err := idToken.Claims(claims); err != nil {
err := fmt.Errorf("could not parse claims from idToken: %s", err)
diff --git a/internal/processing/account/create.go b/internal/processing/account/create.go
index 44d6bbea5..e6cb44ce8 100644
--- a/internal/processing/account/create.go
+++ b/internal/processing/account/create.go
@@ -22,21 +22,18 @@ import (
"context"
"fmt"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/ap"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/text"
"github.com/superseriousbusiness/oauth2/v4"
)
func (p *processor) Create(ctx context.Context, applicationToken oauth2.TokenInfo, application *gtsmodel.Application, form *apimodel.AccountCreateRequest) (*apimodel.Token, gtserror.WithCode) {
- l := logrus.WithField("func", "accountCreate")
-
emailAvailable, err := p.db.IsEmailAvailable(ctx, form.Email)
if err != nil {
return nil, gtserror.NewErrorBadRequest(err)
@@ -62,13 +59,13 @@ func (p *processor) Create(ctx context.Context, applicationToken oauth2.TokenInf
reason = ""
}
- l.Trace("creating new username and account")
+ log.Trace("creating new username and account")
user, err := p.db.NewSignup(ctx, form.Username, text.SanitizePlaintext(reason), approvalRequired, form.Email, form.Password, form.IP, form.Locale, application.ID, false, false)
if err != nil {
return nil, gtserror.NewErrorInternalError(fmt.Errorf("error creating new signup in the database: %s", err))
}
- l.Tracef("generating a token for user %s with account %s and application %s", user.ID, user.AccountID, application.ID)
+ log.Tracef("generating a token for user %s with account %s and application %s", user.ID, user.AccountID, application.ID)
accessToken, err := p.oauthServer.GenerateUserAccessToken(ctx, applicationToken, application.ClientSecret, user.ID)
if err != nil {
return nil, gtserror.NewErrorInternalError(fmt.Errorf("error creating new access token for user %s: %s", user.ID, err))
diff --git a/internal/processing/account/delete.go b/internal/processing/account/delete.go
index 67192cb8f..7b382f17c 100644
--- a/internal/processing/account/delete.go
+++ b/internal/processing/account/delete.go
@@ -23,12 +23,13 @@ import (
"errors"
"time"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/ap"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"golang.org/x/crypto/bcrypt"
)
@@ -55,14 +56,16 @@ import (
// 17. Delete account's timeline
// 18. Delete account itself
func (p *processor) Delete(ctx context.Context, account *gtsmodel.Account, origin string) gtserror.WithCode {
- fields := logrus.Fields{
- "func": "Delete",
- "username": account.Username,
+ fields := kv.Fields{
+
+ {"username", account.Username},
}
if account.Domain != "" {
- fields["domain"] = account.Domain
+ fields = append(fields, kv.Field{
+ "domain", account.Domain,
+ })
}
- l := logrus.WithFields(fields)
+ l := log.WithFields(fields...)
l.Debug("beginning account delete process")
diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go
index d1085845b..78791dcce 100644
--- a/internal/processing/account/update.go
+++ b/internal/processing/account/update.go
@@ -24,13 +24,12 @@ import (
"io"
"mime/multipart"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/ap"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/text"
@@ -39,8 +38,6 @@ import (
)
func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form *apimodel.UpdateCredentialsRequest) (*apimodel.Account, gtserror.WithCode) {
- l := logrus.WithField("func", "AccountUpdate")
-
if form.Discoverable != nil {
account.Discoverable = *form.Discoverable
}
@@ -81,7 +78,7 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form
}
account.AvatarMediaAttachmentID = avatarInfo.ID
account.AvatarMediaAttachment = avatarInfo
- l.Tracef("new avatar info for account %s is %+v", account.ID, avatarInfo)
+ log.Tracef("new avatar info for account %s is %+v", account.ID, avatarInfo)
}
if form.Header != nil && form.Header.Size != 0 {
@@ -91,7 +88,7 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form
}
account.HeaderMediaAttachmentID = headerInfo.ID
account.HeaderMediaAttachment = headerInfo
- l.Tracef("new header info for account %s is %+v", account.ID, headerInfo)
+ log.Tracef("new header info for account %s is %+v", account.ID, headerInfo)
}
if form.Locked != nil {
diff --git a/internal/processing/admin/createdomainblock.go b/internal/processing/admin/createdomainblock.go
index 1c641950c..b42445380 100644
--- a/internal/processing/admin/createdomainblock.go
+++ b/internal/processing/admin/createdomainblock.go
@@ -24,13 +24,14 @@ import (
"strings"
"time"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/ap"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/text"
)
@@ -90,10 +91,10 @@ func (p *processor) DomainBlockCreate(ctx context.Context, account *gtsmodel.Acc
// 2. Delete the instance account for that instance if it exists.
// 3. Select all accounts from this instance and pass them through the delete functionality of the processor.
func (p *processor) initiateDomainBlockSideEffects(ctx context.Context, account *gtsmodel.Account, block *gtsmodel.DomainBlock) {
- l := logrus.WithFields(logrus.Fields{
- "func": "domainBlockProcessSideEffects",
- "domain": block.Domain,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"domain", block.Domain},
+ }...)
l.Debug("processing domain block side effects")
diff --git a/internal/processing/admin/importdomainblocks.go b/internal/processing/admin/importdomainblocks.go
index b78589b8a..57235a5b8 100644
--- a/internal/processing/admin/importdomainblocks.go
+++ b/internal/processing/admin/importdomainblocks.go
@@ -34,7 +34,6 @@ import (
// DomainBlocksImport handles the import of a bunch of domain blocks at once, by calling the DomainBlockCreate function for each domain in the provided file.
func (p *processor) DomainBlocksImport(ctx context.Context, account *gtsmodel.Account, domains *multipart.FileHeader) ([]*apimodel.DomainBlock, gtserror.WithCode) {
-
f, err := domains.Open()
if err != nil {
return nil, gtserror.NewErrorBadRequest(fmt.Errorf("DomainBlocksImport: error opening attachment: %s", err))
@@ -56,7 +55,6 @@ func (p *processor) DomainBlocksImport(ctx context.Context, account *gtsmodel.Ac
blocks := []*apimodel.DomainBlock{}
for _, d := range d {
block, err := p.DomainBlockCreate(ctx, account, d.Domain.Domain, false, d.PublicComment, "", "")
-
if err != nil {
return nil, err
}
diff --git a/internal/processing/admin/mediaprune.go b/internal/processing/admin/mediaprune.go
index 1c3398b78..40652c3ca 100644
--- a/internal/processing/admin/mediaprune.go
+++ b/internal/processing/admin/mediaprune.go
@@ -22,8 +22,8 @@ import (
"context"
"fmt"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (p *processor) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gtserror.WithCode {
@@ -35,27 +35,27 @@ func (p *processor) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gt
go func() {
pruned, err := p.mediaManager.PruneAllRemote(ctx, mediaRemoteCacheDays)
if err != nil {
- logrus.Errorf("MediaPrune: error pruning remote cache: %s", err)
+ log.Errorf("MediaPrune: error pruning remote cache: %s", err)
} else {
- logrus.Infof("MediaPrune: pruned %d remote cache entries", pruned)
+ log.Infof("MediaPrune: pruned %d remote cache entries", pruned)
}
}()
go func() {
pruned, err := p.mediaManager.PruneUnusedLocalAttachments(ctx)
if err != nil {
- logrus.Errorf("MediaPrune: error pruning unused local cache: %s", err)
+ log.Errorf("MediaPrune: error pruning unused local cache: %s", err)
} else {
- logrus.Infof("MediaPrune: pruned %d unused local cache entries", pruned)
+ log.Infof("MediaPrune: pruned %d unused local cache entries", pruned)
}
}()
go func() {
pruned, err := p.mediaManager.PruneAllMeta(ctx)
if err != nil {
- logrus.Errorf("MediaPrune: error pruning meta: %s", err)
+ log.Errorf("MediaPrune: error pruning meta: %s", err)
} else {
- logrus.Infof("MediaPrune: pruned %d meta entries", pruned)
+ log.Infof("MediaPrune: pruned %d meta entries", pruned)
}
}()
diff --git a/internal/processing/fromclientapi.go b/internal/processing/fromclientapi.go
index 24465a059..0f684f200 100644
--- a/internal/processing/fromclientapi.go
+++ b/internal/processing/fromclientapi.go
@@ -24,15 +24,36 @@ import (
"fmt"
"net/url"
+ "codeberg.org/gruf/go-kv"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
)
func (p *processor) ProcessFromClientAPI(ctx context.Context, clientMsg messages.FromClientAPI) error {
+ // Allocate new log fields slice
+ fields := make([]kv.Field, 3, 4)
+ fields[0] = kv.Field{"activityType", clientMsg.APActivityType}
+ fields[1] = kv.Field{"objectType", clientMsg.APObjectType}
+ fields[2] = kv.Field{"fromAccount", clientMsg.OriginAccount.Username}
+
+ if clientMsg.GTSModel != nil &&
+ log.Level() >= level.DEBUG {
+ // Append converted model to log
+ fields = append(fields, kv.Field{
+ "model", clientMsg.GTSModel,
+ })
+ }
+
+ // Log this federated message
+ l := log.WithFields(fields...)
+ l.Info("processing from client")
+
switch clientMsg.APActivityType {
case ap.ActivityCreate:
// CREATE
diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go
index e39a6b4e8..132b33f4c 100644
--- a/internal/processing/fromfederator.go
+++ b/internal/processing/fromfederator.go
@@ -24,11 +24,13 @@ import (
"fmt"
"net/url"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
)
@@ -36,12 +38,30 @@ import (
// and directs the message into the appropriate side effect handler function, or simply does nothing if there's
// no handler function defined for the combination of Activity and Object.
func (p *processor) ProcessFromFederator(ctx context.Context, federatorMsg messages.FromFederator) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "processFromFederator",
- "APActivityType": federatorMsg.APActivityType,
- "APObjectType": federatorMsg.APObjectType,
- })
- l.Trace("processing message from federator")
+ // Allocate new log fields slice
+ fields := make([]kv.Field, 3, 5)
+ fields[0] = kv.Field{"activityType", federatorMsg.APActivityType}
+ fields[1] = kv.Field{"objectType", federatorMsg.APObjectType}
+ fields[2] = kv.Field{"toAccount", federatorMsg.ReceivingAccount.Username}
+
+ if federatorMsg.APIri != nil {
+ // An IRI was supplied, append to log
+ fields = append(fields, kv.Field{
+ "iri", federatorMsg.APIri,
+ })
+ }
+
+ if federatorMsg.GTSModel != nil &&
+ log.Level() >= level.DEBUG {
+ // Append converted model to log
+ fields = append(fields, kv.Field{
+ "model", federatorMsg.GTSModel,
+ })
+ }
+
+ // Log this federated message
+ l := log.WithFields(fields...)
+ l.Info("processing from federator")
switch federatorMsg.APActivityType {
case ap.ActivityCreate:
diff --git a/internal/processing/media/getemoji.go b/internal/processing/media/getemoji.go
index e84e5b570..ee33c25eb 100644
--- a/internal/processing/media/getemoji.go
+++ b/internal/processing/media/getemoji.go
@@ -22,10 +22,10 @@ import (
"context"
"fmt"
- "github.com/sirupsen/logrus"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (p *processor) GetCustomEmojis(ctx context.Context) ([]*apimodel.Emoji, gtserror.WithCode) {
@@ -40,7 +40,7 @@ func (p *processor) GetCustomEmojis(ctx context.Context) ([]*apimodel.Emoji, gts
for _, gtsEmoji := range emojis {
apiEmoji, err := p.tc.EmojiToAPIEmoji(ctx, gtsEmoji)
if err != nil {
- logrus.Errorf("error converting emoji with id %s: %s", gtsEmoji.ID, err)
+ log.Errorf("error converting emoji with id %s: %s", gtsEmoji.ID, err)
continue
}
apiEmojis = append(apiEmojis, &apiEmoji)
diff --git a/internal/processing/notification.go b/internal/processing/notification.go
index ee0e4ae34..9b99141a6 100644
--- a/internal/processing/notification.go
+++ b/internal/processing/notification.go
@@ -21,18 +21,15 @@ package processing
import (
"context"
- "github.com/sirupsen/logrus"
-
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/timeline"
"github.com/superseriousbusiness/gotosocial/internal/util"
)
func (p *processor) NotificationsGet(ctx context.Context, authed *oauth.Auth, limit int, maxID string, sinceID string) (*apimodel.TimelineResponse, gtserror.WithCode) {
- l := logrus.WithField("func", "NotificationsGet")
-
notifs, err := p.db.GetNotifications(ctx, authed.Account.ID, limit, maxID, sinceID)
if err != nil {
return nil, gtserror.NewErrorInternalError(err)
@@ -46,7 +43,7 @@ func (p *processor) NotificationsGet(ctx context.Context, authed *oauth.Auth, li
for _, n := range notifs {
apiNotif, err := p.tc.NotificationToAPINotification(ctx, n)
if err != nil {
- l.Debugf("got an error converting a notification to api, will skip it: %s", err)
+ log.Debugf("got an error converting a notification to api, will skip it: %s", err)
continue
}
timelineables = append(timelineables, apiNotif)
diff --git a/internal/processing/search.go b/internal/processing/search.go
index ee64526e5..d25bee2ae 100644
--- a/internal/processing/search.go
+++ b/internal/processing/search.go
@@ -25,22 +25,23 @@ import (
"net/url"
"strings"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/util"
)
func (p *processor) SearchGet(ctx context.Context, authed *oauth.Auth, search *apimodel.SearchQuery) (*apimodel.SearchResult, gtserror.WithCode) {
- l := logrus.WithFields(logrus.Fields{
- "func": "SearchGet",
- "query": search.Query,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"query", search.Query},
+ }...)
// tidy up the query and make sure it wasn't just spaces
query := strings.TrimSpace(search.Query)
@@ -133,11 +134,11 @@ func (p *processor) SearchGet(ctx context.Context, authed *oauth.Auth, search *a
}
func (p *processor) searchStatusByURI(ctx context.Context, authed *oauth.Auth, uri *url.URL, resolve bool) (*gtsmodel.Status, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "searchStatusByURI",
- "uri": uri.String(),
- "resolve": resolve,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"uri", uri.String()},
+ {"resolve", resolve},
+ }...)
if maybeStatus, err := p.db.GetStatusByURI(ctx, uri.String()); err == nil {
return maybeStatus, nil
diff --git a/internal/processing/status/util.go b/internal/processing/status/util.go
index 79c416f98..52214e95f 100644
--- a/internal/processing/status/util.go
+++ b/internal/processing/status/util.go
@@ -23,11 +23,11 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/util"
)
@@ -204,12 +204,12 @@ func (p *processor) ProcessMentions(ctx context.Context, form *apimodel.Advanced
for _, mentionedAccountName := range mentionedAccountNames {
gtsMention, err := p.parseMention(ctx, mentionedAccountName, accountID, status.ID)
if err != nil {
- logrus.Errorf("ProcessMentions: error parsing mention %s from status: %s", mentionedAccountName, err)
+ log.Errorf("ProcessMentions: error parsing mention %s from status: %s", mentionedAccountName, err)
continue
}
if err := p.db.Put(ctx, gtsMention); err != nil {
- logrus.Errorf("ProcessMentions: error putting mention in db: %s", err)
+ log.Errorf("ProcessMentions: error putting mention in db: %s", err)
}
mentions = append(mentions, gtsMention)
diff --git a/internal/processing/status/util_test.go b/internal/processing/status/util_test.go
index 80c2da897..f1b826bd0 100644
--- a/internal/processing/status/util_test.go
+++ b/internal/processing/status/util_test.go
@@ -34,8 +34,11 @@ const statusText1 = `Another test @foss_satan@fossbros-anonymous.io
#Hashtag
Text`
-const statusText1ExpectedFull = "Another test @foss_satan
#Hashtag
Text
"
-const statusText1ExpectedPartial = "Another test @foss_satan
#Hashtag
Text
"
+
+const (
+ statusText1ExpectedFull = "Another test @foss_satan
#Hashtag
Text
"
+ statusText1ExpectedPartial = "Another test @foss_satan
#Hashtag
Text
"
+)
const statusText2 = `Another test @foss_satan@fossbros-anonymous.io
@@ -97,7 +100,6 @@ func (suite *UtilTestSuite) TestProcessMentions1() {
}
func (suite *UtilTestSuite) TestProcessContentFull1() {
-
/*
TEST PREPARATION
*/
@@ -146,7 +148,6 @@ func (suite *UtilTestSuite) TestProcessContentFull1() {
}
func (suite *UtilTestSuite) TestProcessContentPartial1() {
-
/*
TEST PREPARATION
*/
@@ -238,7 +239,6 @@ func (suite *UtilTestSuite) TestProcessMentions2() {
}
func (suite *UtilTestSuite) TestProcessContentFull2() {
-
/*
TEST PREPARATION
*/
@@ -288,7 +288,6 @@ func (suite *UtilTestSuite) TestProcessContentFull2() {
}
func (suite *UtilTestSuite) TestProcessContentPartial2() {
-
/*
TEST PREPARATION
*/
diff --git a/internal/processing/statustimeline.go b/internal/processing/statustimeline.go
index 081709302..b7313818c 100644
--- a/internal/processing/statustimeline.go
+++ b/internal/processing/statustimeline.go
@@ -23,12 +23,11 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
-
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/timeline"
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
@@ -73,7 +72,7 @@ func StatusFilterFunction(database db.DB, filter visibility.Filter) timeline.Fil
timelineable, err := filter.StatusHometimelineable(ctx, status, requestingAccount)
if err != nil {
- logrus.Warnf("error checking hometimelineability of status %s for account %s: %s", status.ID, timelineAccountID, err)
+ log.Warnf("error checking hometimelineability of status %s for account %s: %s", status.ID, timelineAccountID, err)
}
return timelineable, nil // we don't return the error here because we want to just skip this item if something goes wrong
@@ -235,14 +234,12 @@ func (p *processor) FavedTimelineGet(ctx context.Context, authed *oauth.Auth, ma
}
func (p *processor) filterPublicStatuses(ctx context.Context, authed *oauth.Auth, statuses []*gtsmodel.Status) ([]*apimodel.Status, error) {
- l := logrus.WithField("func", "filterPublicStatuses")
-
apiStatuses := []*apimodel.Status{}
for _, s := range statuses {
targetAccount := >smodel.Account{}
if err := p.db.GetByID(ctx, s.AccountID, targetAccount); err != nil {
if err == db.ErrNoEntries {
- l.Debugf("filterPublicStatuses: skipping status %s because account %s can't be found in the db", s.ID, s.AccountID)
+ log.Debugf("filterPublicStatuses: skipping status %s because account %s can't be found in the db", s.ID, s.AccountID)
continue
}
return nil, gtserror.NewErrorInternalError(fmt.Errorf("filterPublicStatuses: error getting status author: %s", err))
@@ -250,7 +247,7 @@ func (p *processor) filterPublicStatuses(ctx context.Context, authed *oauth.Auth
timelineable, err := p.filter.StatusPublictimelineable(ctx, s, authed.Account)
if err != nil {
- l.Debugf("filterPublicStatuses: skipping status %s because of an error checking status visibility: %s", s.ID, err)
+ log.Debugf("filterPublicStatuses: skipping status %s because of an error checking status visibility: %s", s.ID, err)
continue
}
if !timelineable {
@@ -259,7 +256,7 @@ func (p *processor) filterPublicStatuses(ctx context.Context, authed *oauth.Auth
apiStatus, err := p.tc.StatusToAPIStatus(ctx, s, authed.Account)
if err != nil {
- l.Debugf("filterPublicStatuses: skipping status %s because it couldn't be converted to its api representation: %s", s.ID, err)
+ log.Debugf("filterPublicStatuses: skipping status %s because it couldn't be converted to its api representation: %s", s.ID, err)
continue
}
@@ -270,14 +267,12 @@ func (p *processor) filterPublicStatuses(ctx context.Context, authed *oauth.Auth
}
func (p *processor) filterFavedStatuses(ctx context.Context, authed *oauth.Auth, statuses []*gtsmodel.Status) ([]*apimodel.Status, error) {
- l := logrus.WithField("func", "filterFavedStatuses")
-
apiStatuses := []*apimodel.Status{}
for _, s := range statuses {
targetAccount := >smodel.Account{}
if err := p.db.GetByID(ctx, s.AccountID, targetAccount); err != nil {
if err == db.ErrNoEntries {
- l.Debugf("filterFavedStatuses: skipping status %s because account %s can't be found in the db", s.ID, s.AccountID)
+ log.Debugf("filterFavedStatuses: skipping status %s because account %s can't be found in the db", s.ID, s.AccountID)
continue
}
return nil, gtserror.NewErrorInternalError(fmt.Errorf("filterPublicStatuses: error getting status author: %s", err))
@@ -285,7 +280,7 @@ func (p *processor) filterFavedStatuses(ctx context.Context, authed *oauth.Auth,
timelineable, err := p.filter.StatusVisible(ctx, s, authed.Account)
if err != nil {
- l.Debugf("filterFavedStatuses: skipping status %s because of an error checking status visibility: %s", s.ID, err)
+ log.Debugf("filterFavedStatuses: skipping status %s because of an error checking status visibility: %s", s.ID, err)
continue
}
if !timelineable {
@@ -294,7 +289,7 @@ func (p *processor) filterFavedStatuses(ctx context.Context, authed *oauth.Auth,
apiStatus, err := p.tc.StatusToAPIStatus(ctx, s, authed.Account)
if err != nil {
- l.Debugf("filterFavedStatuses: skipping status %s because it couldn't be converted to its api representation: %s", s.ID, err)
+ log.Debugf("filterFavedStatuses: skipping status %s because it couldn't be converted to its api representation: %s", s.ID, err)
continue
}
diff --git a/internal/processing/streaming/openstream.go b/internal/processing/streaming/openstream.go
index b005ef9bd..3623a7ceb 100644
--- a/internal/processing/streaming/openstream.go
+++ b/internal/processing/streaming/openstream.go
@@ -23,19 +23,20 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/stream"
)
func (p *processor) OpenStreamForAccount(ctx context.Context, account *gtsmodel.Account, streamTimeline string) (*stream.Stream, gtserror.WithCode) {
- l := logrus.WithFields(logrus.Fields{
- "func": "OpenStreamForAccount",
- "account": account.ID,
- "streamType": streamTimeline,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"account", account.ID},
+ {"streamType", streamTimeline},
+ }...)
l.Debug("received open stream request")
// each stream needs a unique ID so we know to close it
diff --git a/internal/router/logger.go b/internal/router/logger.go
index 692a616a4..2e23b9cfb 100644
--- a/internal/router/logger.go
+++ b/internal/router/logger.go
@@ -21,19 +21,20 @@ package router
import (
"fmt"
"net/http"
- "os"
"time"
"codeberg.org/gruf/go-bytesize"
"codeberg.org/gruf/go-errors/v2"
+ "codeberg.org/gruf/go-kv"
+ "codeberg.org/gruf/go-logger/v2/level"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// loggingMiddleware provides a request logging and panic recovery gin handler.
func loggingMiddleware(c *gin.Context) {
// Initialize the logging fields
- fields := make(logrus.Fields, 7)
+ fields := make(kv.Fields, 6, 7)
// Determine pre-handler time
before := time.Now()
@@ -49,11 +50,12 @@ func loggingMiddleware(c *gin.Context) {
}
// Append panic information to the request ctx
- _ = c.Error(fmt.Errorf("recovered panic: %v", r))
+ err := fmt.Errorf("recovered panic: %v", r)
+ _ = c.Error(err)
- // Dump a stacktrace to stderr
+ // Dump a stacktrace to error log
callers := errors.GetCallers(3, 10)
- fmt.Fprintf(os.Stderr, "recovered panic: %v\n%s", r, callers)
+ log.WithField("stacktrace", callers).Error(err)
}
// NOTE:
@@ -63,32 +65,38 @@ func loggingMiddleware(c *gin.Context) {
// and could lead to storing plaintext API keys in logs
// Set request logging fields
- fields["latency"] = time.Since(before)
- fields["clientIP"] = c.ClientIP()
- fields["userAgent"] = c.Request.UserAgent()
- fields["method"] = c.Request.Method
- fields["statusCode"] = code
- fields["path"] = path
+ fields[0] = kv.Field{"latency", time.Since(before)}
+ fields[1] = kv.Field{"clientIP", c.ClientIP()}
+ fields[2] = kv.Field{"userAgent", c.Request.UserAgent()}
+ fields[3] = kv.Field{"method", c.Request.Method}
+ fields[4] = kv.Field{"statusCode", code}
+ fields[5] = kv.Field{"path", path}
- // Create a log entry with fields
- l := logrus.WithFields(fields)
- l.Level = logrus.InfoLevel
+ var lvl level.LEVEL
+
+ // Default is info
+ lvl = level.INFO
if code >= 500 {
// This is a server error
- l.Level = logrus.ErrorLevel
+ lvl = level.ERROR
if len(c.Errors) > 0 {
// Add an error string log field
- fields["error"] = c.Errors.String()
+ fields = append(fields, kv.Field{
+ "error", c.Errors.String(),
+ })
}
}
// Generate a nicer looking bytecount
size := bytesize.Size(c.Writer.Size())
+ // Create log entry with fields
+ l := log.WithFields(fields...)
+
// Finally, write log entry with status text body size
- l.Logf(l.Level, "%s: wrote %s", http.StatusText(code), size)
+ l.Logf(lvl, "%s: wrote %s", http.StatusText(code), size)
}()
// Process request
diff --git a/internal/router/router.go b/internal/router/router.go
index 5eb4cb222..da00b685d 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -26,9 +26,9 @@ import (
"codeberg.org/gruf/go-debug"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"golang.org/x/crypto/acme/autocert"
)
@@ -94,10 +94,10 @@ func (r *router) Start() {
)
// Start the LetsEncrypt autocert manager HTTP server.
- logrus.Infof("letsencrypt listening on %s", srv.Addr)
+ log.Infof("letsencrypt listening on %s", srv.Addr)
if err := srv.ListenAndServe(); err != nil &&
err != http.ErrServerClosed {
- logrus.Fatalf("letsencrypt: listen: %s", err)
+ log.Fatalf("letsencrypt: listen: %s", err)
}
}()
@@ -112,16 +112,16 @@ func (r *router) Start() {
r.srv.Handler = debug.WithPprof(r.srv.Handler)
if debug.DEBUG() {
// Profiling requires timeouts longer than 30s, so reset these.
- logrus.Warn("resetting http.Server{} timeout to support profiling")
+ log.Warn("resetting http.Server{} timeout to support profiling")
r.srv.ReadTimeout = 0
r.srv.WriteTimeout = 0
}
// Start the main listener.
go func() {
- logrus.Infof("listening on %s", r.srv.Addr)
+ log.Infof("listening on %s", r.srv.Addr)
if err := listen(); err != nil && err != http.ErrServerClosed {
- logrus.Fatalf("listen: %s", err)
+ log.Fatalf("listen: %s", err)
}
}()
}
diff --git a/internal/router/session.go b/internal/router/session.go
index b49542428..eb4b83874 100644
--- a/internal/router/session.go
+++ b/internal/router/session.go
@@ -29,9 +29,9 @@ import (
"github.com/gin-contrib/sessions"
"github.com/gin-contrib/sessions/memstore"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"golang.org/x/net/idna"
)
@@ -44,7 +44,7 @@ func SessionOptions() sessions.Options {
case "strict":
samesite = http.SameSiteStrictMode
default:
- logrus.Warnf("%s set to %s which is not recognized, defaulting to 'lax'", config.AdvancedCookiesSamesiteFlag(), config.GetAdvancedCookiesSamesite())
+ log.Warnf("%s set to %s which is not recognized, defaulting to 'lax'", config.AdvancedCookiesSamesiteFlag(), config.GetAdvancedCookiesSamesite())
samesite = http.SameSiteLaxMode
}
diff --git a/internal/storage/local.go b/internal/storage/local.go
index da57631f9..8ed3ca8d8 100644
--- a/internal/storage/local.go
+++ b/internal/storage/local.go
@@ -33,18 +33,23 @@ type Local struct {
func (l *Local) Get(ctx context.Context, key string) ([]byte, error) {
return l.KVStore.Get(key)
}
+
func (l *Local) GetStream(ctx context.Context, key string) (io.ReadCloser, error) {
return l.KVStore.GetStream(key)
}
+
func (l *Local) PutStream(ctx context.Context, key string, r io.Reader) error {
return l.KVStore.PutStream(key, r)
}
+
func (l *Local) Put(ctx context.Context, key string, value []byte) error {
return l.KVStore.Put(key, value)
}
+
func (l *Local) Delete(ctx context.Context, key string) error {
return l.KVStore.Delete(key)
}
+
func (l *Local) URL(ctx context.Context, key string) *url.URL {
return nil
}
diff --git a/internal/storage/s3.go b/internal/storage/s3.go
index a15114488..ee51bea89 100644
--- a/internal/storage/s3.go
+++ b/internal/storage/s3.go
@@ -55,6 +55,7 @@ func (s *S3) Get(ctx context.Context, key string) ([]byte, error) {
}
return b, nil
}
+
func (s *S3) GetStream(ctx context.Context, key string) (io.ReadCloser, error) {
o, err := s.mc.GetObject(ctx, s.bucket, key, minio.GetObjectOptions{})
if err != nil {
@@ -62,21 +63,25 @@ func (s *S3) GetStream(ctx context.Context, key string) (io.ReadCloser, error) {
}
return o, err
}
+
func (s *S3) PutStream(ctx context.Context, key string, r io.Reader) error {
if _, err := s.mc.PutObject(ctx, s.bucket, key, r, -1, minio.PutObjectOptions{}); err != nil {
return fmt.Errorf("uploading data stream: %w", err)
}
return nil
}
+
func (s *S3) Put(ctx context.Context, key string, value []byte) error {
if _, err := s.mc.PutObject(ctx, s.bucket, key, bytes.NewBuffer(value), -1, minio.PutObjectOptions{}); err != nil {
return fmt.Errorf("uploading data slice: %w", err)
}
return nil
}
+
func (s *S3) Delete(ctx context.Context, key string) error {
return s.mc.RemoveObject(ctx, s.bucket, key, minio.RemoveObjectOptions{})
}
+
func (s *S3) URL(ctx context.Context, key string) *url.URL {
// it's safe to ignore the error here, as we just fall back to fetching the
// file if the url request fails
diff --git a/internal/storage/storage.go b/internal/storage/storage.go
index 88577442f..7a4ebc6c3 100644
--- a/internal/storage/storage.go
+++ b/internal/storage/storage.go
@@ -33,9 +33,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/config"
)
-var (
- ErrNotSupported = errors.New("driver does not suppport functionality")
-)
+var ErrNotSupported = errors.New("driver does not suppport functionality")
// Driver implements the functionality to store and retrieve blobs
// (images,video,audio)
diff --git a/internal/text/common.go b/internal/text/common.go
index 12c0f1dfa..9ed3fb06f 100644
--- a/internal/text/common.go
+++ b/internal/text/common.go
@@ -25,9 +25,8 @@ import (
"strings"
"unicode"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/regexes"
)
@@ -105,7 +104,7 @@ func (f *formatter) ReplaceMentions(ctx context.Context, in string, mentions []*
if menchie.TargetAccount == nil {
a, err := f.db.GetAccountByID(ctx, menchie.TargetAccountID)
if err != nil {
- logrus.Errorf("error getting account with id %s from the db: %s", menchie.TargetAccountID, err)
+ log.Errorf("error getting account with id %s from the db: %s", menchie.TargetAccountID, err)
return match
}
menchie.TargetAccount = a
diff --git a/internal/timeline/get.go b/internal/timeline/get.go
index a3cc8ef9b..cb6399ec9 100644
--- a/internal/timeline/get.go
+++ b/internal/timeline/get.go
@@ -24,20 +24,21 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
const retries = 5
func (t *timeline) Get(ctx context.Context, amount int, maxID string, sinceID string, minID string, prepareNext bool) ([]Preparable, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Get",
- "accountID": t.accountID,
- "amount": amount,
- "maxID": maxID,
- "sinceID": sinceID,
- "minID": minID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"accountID", t.accountID},
+ {"amount", amount},
+ {"maxID", maxID},
+ {"sinceID", sinceID},
+ {"minID", minID},
+ }...)
l.Debug("entering get")
var items []Preparable
@@ -136,12 +137,12 @@ func (t *timeline) GetXFromTop(ctx context.Context, amount int) ([]Preparable, e
}
func (t *timeline) GetXBehindID(ctx context.Context, amount int, behindID string, attempts *int) ([]Preparable, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "GetXBehindID",
- "amount": amount,
- "behindID": behindID,
- "attempts": *attempts,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ {"behindID", behindID},
+ {"attempts", attempts},
+ }...)
newAttempts := *attempts
newAttempts++
diff --git a/internal/timeline/index.go b/internal/timeline/index.go
index bda3a9c6c..76c16977b 100644
--- a/internal/timeline/index.go
+++ b/internal/timeline/index.go
@@ -24,14 +24,15 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (t *timeline) IndexBefore(ctx context.Context, itemID string, amount int) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "IndexBefore",
- "amount": amount,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ }...)
// lazily initialize index if it hasn't been done already
if t.itemIndex.data == nil {
@@ -81,10 +82,10 @@ grabloop:
}
func (t *timeline) IndexBehind(ctx context.Context, itemID string, amount int) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "IndexBehind",
- "amount": amount,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ }...)
// lazily initialize index if it hasn't been done already
if t.itemIndex.data == nil {
diff --git a/internal/timeline/manager.go b/internal/timeline/manager.go
index 02a388aba..51bd65fbf 100644
--- a/internal/timeline/manager.go
+++ b/internal/timeline/manager.go
@@ -24,7 +24,8 @@ import (
"strings"
"sync"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
const (
@@ -98,11 +99,11 @@ type manager struct {
}
func (m *manager) Ingest(ctx context.Context, item Timelineable, timelineAccountID string) (bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Ingest",
- "timelineAccountID": timelineAccountID,
- "itemID": item.GetID(),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"timelineAccountID", timelineAccountID},
+ {"itemID", item.GetID()},
+ }...)
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
if err != nil {
@@ -114,11 +115,11 @@ func (m *manager) Ingest(ctx context.Context, item Timelineable, timelineAccount
}
func (m *manager) IngestAndPrepare(ctx context.Context, item Timelineable, timelineAccountID string) (bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "IngestAndPrepare",
- "timelineAccountID": timelineAccountID,
- "itemID": item.GetID(),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"timelineAccountID", timelineAccountID},
+ {"itemID", item.GetID()},
+ }...)
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
if err != nil {
@@ -130,11 +131,11 @@ func (m *manager) IngestAndPrepare(ctx context.Context, item Timelineable, timel
}
func (m *manager) Remove(ctx context.Context, timelineAccountID string, itemID string) (int, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Remove",
- "timelineAccountID": timelineAccountID,
- "itemID": itemID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"timelineAccountID", timelineAccountID},
+ {"itemID", itemID},
+ }...)
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
if err != nil {
@@ -146,10 +147,10 @@ func (m *manager) Remove(ctx context.Context, timelineAccountID string, itemID s
}
func (m *manager) GetTimeline(ctx context.Context, timelineAccountID string, maxID string, sinceID string, minID string, limit int, local bool) ([]Preparable, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "GetTimeline",
- "timelineAccountID": timelineAccountID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"timelineAccountID", timelineAccountID},
+ }...)
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
if err != nil {
diff --git a/internal/timeline/prepare.go b/internal/timeline/prepare.go
index dae9031e5..c643d1873 100644
--- a/internal/timeline/prepare.go
+++ b/internal/timeline/prepare.go
@@ -24,18 +24,19 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (t *timeline) prepareNextQuery(ctx context.Context, amount int, maxID string, sinceID string, minID string) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "prepareNextQuery",
- "amount": amount,
- "maxID": maxID,
- "sinceID": sinceID,
- "minID": minID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ {"maxID", maxID},
+ {"sinceID", sinceID},
+ {"minID", minID},
+ }...)
var err error
@@ -169,10 +170,10 @@ prepareloop:
}
func (t *timeline) PrepareFromTop(ctx context.Context, amount int) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "PrepareFromTop",
- "amount": amount,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ }...)
// lazily initialize prepared posts if it hasn't been done already
if t.preparedItems.data == nil {
diff --git a/internal/timeline/remove.go b/internal/timeline/remove.go
index 60d8108ec..1e70e28a7 100644
--- a/internal/timeline/remove.go
+++ b/internal/timeline/remove.go
@@ -23,15 +23,17 @@ import (
"context"
"errors"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (t *timeline) Remove(ctx context.Context, statusID string) (int, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Remove",
- "accountTimeline": t.accountID,
- "statusID": statusID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"accountTimeline", t.accountID},
+ {"statusID", statusID},
+ }...)
+
t.Lock()
defer t.Unlock()
var removed int
@@ -79,11 +81,11 @@ func (t *timeline) Remove(ctx context.Context, statusID string) (int, error) {
}
func (t *timeline) RemoveAllBy(ctx context.Context, accountID string) (int, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "RemoveAllBy",
- "accountTimeline": t.accountID,
- "accountID": accountID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"accountTimeline", t.accountID},
+ {"accountID", accountID},
+ }...)
t.Lock()
defer t.Unlock()
var removed int
diff --git a/internal/trans/import.go b/internal/trans/import.go
index f4f3eb8d4..5307f5f75 100644
--- a/internal/trans/import.go
+++ b/internal/trans/import.go
@@ -26,8 +26,7 @@ import (
"io"
"os"
- "github.com/sirupsen/logrus"
-
+ "github.com/superseriousbusiness/gotosocial/internal/log"
transmodel "github.com/superseriousbusiness/gotosocial/internal/trans/model"
)
@@ -49,7 +48,7 @@ func (i *importer) Import(ctx context.Context, path string) error {
err := decoder.Decode(&entry)
if err != nil {
if err == io.EOF {
- logrus.Infof("Import: reached end of file")
+ log.Infof("Import: reached end of file")
return neatClose(file)
}
return fmt.Errorf("Import: error decoding in readLoop: %s", err)
@@ -75,7 +74,7 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.Entry) error
if err := i.putInDB(ctx, account); err != nil {
return fmt.Errorf("inputEntry: error adding account to database: %s", err)
}
- logrus.Infof("inputEntry: added account with id %s", account.ID)
+ log.Infof("inputEntry: added account with id %s", account.ID)
return nil
case transmodel.TransBlock:
block, err := i.blockDecode(entry)
@@ -85,7 +84,7 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.Entry) error
if err := i.putInDB(ctx, block); err != nil {
return fmt.Errorf("inputEntry: error adding block to database: %s", err)
}
- logrus.Infof("inputEntry: added block with id %s", block.ID)
+ log.Infof("inputEntry: added block with id %s", block.ID)
return nil
case transmodel.TransDomainBlock:
block, err := i.domainBlockDecode(entry)
@@ -95,7 +94,7 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.Entry) error
if err := i.putInDB(ctx, block); err != nil {
return fmt.Errorf("inputEntry: error adding domain block to database: %s", err)
}
- logrus.Infof("inputEntry: added domain block with id %s", block.ID)
+ log.Infof("inputEntry: added domain block with id %s", block.ID)
return nil
case transmodel.TransFollow:
follow, err := i.followDecode(entry)
@@ -105,7 +104,7 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.Entry) error
if err := i.putInDB(ctx, follow); err != nil {
return fmt.Errorf("inputEntry: error adding follow to database: %s", err)
}
- logrus.Infof("inputEntry: added follow with id %s", follow.ID)
+ log.Infof("inputEntry: added follow with id %s", follow.ID)
return nil
case transmodel.TransFollowRequest:
fr, err := i.followRequestDecode(entry)
@@ -115,7 +114,7 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.Entry) error
if err := i.putInDB(ctx, fr); err != nil {
return fmt.Errorf("inputEntry: error adding follow request to database: %s", err)
}
- logrus.Infof("inputEntry: added follow request with id %s", fr.ID)
+ log.Infof("inputEntry: added follow request with id %s", fr.ID)
return nil
case transmodel.TransInstance:
inst, err := i.instanceDecode(entry)
@@ -125,7 +124,7 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.Entry) error
if err := i.putInDB(ctx, inst); err != nil {
return fmt.Errorf("inputEntry: error adding instance to database: %s", err)
}
- logrus.Infof("inputEntry: added instance with id %s", inst.ID)
+ log.Infof("inputEntry: added instance with id %s", inst.ID)
return nil
case transmodel.TransUser:
user, err := i.userDecode(entry)
@@ -135,11 +134,11 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.Entry) error
if err := i.putInDB(ctx, user); err != nil {
return fmt.Errorf("inputEntry: error adding user to database: %s", err)
}
- logrus.Infof("inputEntry: added user with id %s", user.ID)
+ log.Infof("inputEntry: added user with id %s", user.ID)
return nil
}
- logrus.Errorf("inputEntry: didn't recognize transtype '%s', skipping it", t)
+ log.Errorf("inputEntry: didn't recognize transtype '%s', skipping it", t)
return nil
}
diff --git a/internal/transport/controller.go b/internal/transport/controller.go
index 45eb4fd79..255932d5d 100644
--- a/internal/transport/controller.go
+++ b/internal/transport/controller.go
@@ -29,12 +29,12 @@ import (
"codeberg.org/gruf/go-byteutil"
"codeberg.org/gruf/go-cache/v2"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// Controller generates transports for use in making federation requests to other servers.
@@ -73,7 +73,7 @@ func NewController(db db.DB, federatingDB federatingdb.DB, clock pub.Clock, clie
// Transport cache has TTL=1hr freq=1m
c.cache.SetTTL(time.Hour, false)
if !c.cache.Start(time.Minute) {
- logrus.Panic("failed to start transport controller cache")
+ log.Panic("failed to start transport controller cache")
}
return c
diff --git a/internal/transport/derefinstance.go b/internal/transport/derefinstance.go
index 35b088b88..c43625a0b 100644
--- a/internal/transport/derefinstance.go
+++ b/internal/transport/derefinstance.go
@@ -28,19 +28,16 @@ import (
"net/url"
"strings"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/api"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/util"
"github.com/superseriousbusiness/gotosocial/internal/validate"
)
func (t *transport) DereferenceInstance(ctx context.Context, iri *url.URL) (*gtsmodel.Instance, error) {
- l := logrus.WithField("func", "DereferenceInstance")
-
var i *gtsmodel.Instance
var err error
@@ -48,26 +45,26 @@ func (t *transport) DereferenceInstance(ctx context.Context, iri *url.URL) (*gts
// This will provide the most complete picture of an instance, and avoid unnecessary api calls.
//
// This will only work with Mastodon-api compatible instances: Mastodon, some Pleroma instances, GoToSocial.
- l.Debugf("trying to dereference instance %s by /api/v1/instance", iri.Host)
+ log.Debugf("trying to dereference instance %s by /api/v1/instance", iri.Host)
i, err = dereferenceByAPIV1Instance(ctx, t, iri)
if err == nil {
- l.Debugf("successfully dereferenced instance using /api/v1/instance")
+ log.Debugf("successfully dereferenced instance using /api/v1/instance")
return i, nil
}
- l.Debugf("couldn't dereference instance using /api/v1/instance: %s", err)
+ log.Debugf("couldn't dereference instance using /api/v1/instance: %s", err)
// If that doesn't work, try to dereference using /.well-known/nodeinfo.
// This will involve two API calls and return less info overall, but should be more widely compatible.
- l.Debugf("trying to dereference instance %s by /.well-known/nodeinfo", iri.Host)
+ log.Debugf("trying to dereference instance %s by /.well-known/nodeinfo", iri.Host)
i, err = dereferenceByNodeInfo(ctx, t, iri)
if err == nil {
- l.Debugf("successfully dereferenced instance using /.well-known/nodeinfo")
+ log.Debugf("successfully dereferenced instance using /.well-known/nodeinfo")
return i, nil
}
- l.Debugf("couldn't dereference instance using /.well-known/nodeinfo: %s", err)
+ log.Debugf("couldn't dereference instance using /.well-known/nodeinfo: %s", err)
// we couldn't dereference the instance using any of the known methods, so just return a minimal representation
- l.Debugf("returning minimal representation of instance %s", iri.Host)
+ log.Debugf("returning minimal representation of instance %s", iri.Host)
id, err := id.NewRandomULID()
if err != nil {
return nil, fmt.Errorf("error creating new id for instance %s: %s", iri.Host, err)
diff --git a/internal/transport/transport.go b/internal/transport/transport.go
index 22dfbeb9a..80710a519 100644
--- a/internal/transport/transport.go
+++ b/internal/transport/transport.go
@@ -31,11 +31,12 @@ import (
"time"
errorsv2 "codeberg.org/gruf/go-errors/v2"
+ "codeberg.org/gruf/go-kv"
"github.com/go-fed/httpsig"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/httpclient"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// Transport wraps the pub.Transport interface with some additional functionality for fetching remote media.
@@ -90,11 +91,11 @@ func (t *transport) do(r *http.Request, signer func(*http.Request) error, retryO
backoff := time.Second * 2
// Start a log entry for this request
- l := logrus.WithFields(logrus.Fields{
- "pubKeyID": t.pubKeyID,
- "method": r.Method,
- "url": r.URL.String(),
- })
+ l := log.WithFields(kv.Fields{
+ {"pubKeyID", t.pubKeyID},
+ {"method", r.Method},
+ {"url", r.URL.String()},
+ }...)
for i := 0; i < maxRetries; i++ {
// Reset signing header fields
diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go
index d50310ff8..e30608150 100644
--- a/internal/typeutils/astointernal.go
+++ b/internal/typeutils/astointernal.go
@@ -23,11 +23,10 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (c *converter) ASRepresentationToAccount(ctx context.Context, accountable ap.Accountable, accountDomain string, update bool) (*gtsmodel.Account, error) {
@@ -185,7 +184,7 @@ func (c *converter) ASStatusToStatus(ctx context.Context, statusable ap.Statusab
}
status.URI = uriProp.GetIRI().String()
- l := logrus.WithField("statusURI", status.URI)
+ l := log.WithField("statusURI", status.URI)
// web url for viewing this status
if statusURL, err := ap.ExtractURL(statusable); err == nil {
diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go
index a14a3dbab..bb611dd8f 100644
--- a/internal/typeutils/internaltoas.go
+++ b/internal/typeutils/internaltoas.go
@@ -25,13 +25,13 @@ import (
"fmt"
"net/url"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
// const (
@@ -219,7 +219,7 @@ func (c *converter) AccountToAS(ctx context.Context, a *gtsmodel.Account) (vocab
if err == nil {
a.AvatarMediaAttachment = avatar
} else {
- logrus.Errorf("AccountToAS: error getting Avatar with id %s: %s", a.AvatarMediaAttachmentID, err)
+ log.Errorf("AccountToAS: error getting Avatar with id %s: %s", a.AvatarMediaAttachmentID, err)
}
}
@@ -253,7 +253,7 @@ func (c *converter) AccountToAS(ctx context.Context, a *gtsmodel.Account) (vocab
if err == nil {
a.HeaderMediaAttachment = header
} else {
- logrus.Errorf("AccountToAS: error getting Header with id %s: %s", a.HeaderMediaAttachmentID, err)
+ log.Errorf("AccountToAS: error getting Header with id %s: %s", a.HeaderMediaAttachmentID, err)
}
}
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go
index 138b85553..1ac49688a 100644
--- a/internal/typeutils/internaltofrontend.go
+++ b/internal/typeutils/internaltofrontend.go
@@ -23,12 +23,11 @@ import (
"fmt"
"strings"
- "github.com/sirupsen/logrus"
-
"github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/util"
)
@@ -105,7 +104,7 @@ func (c *converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
if err == nil {
a.AvatarMediaAttachment = avi
} else {
- logrus.Errorf("AccountToAPIAccountPublic: error getting Avatar with id %s: %s", a.AvatarMediaAttachmentID, err)
+ log.Errorf("AccountToAPIAccountPublic: error getting Avatar with id %s: %s", a.AvatarMediaAttachmentID, err)
}
}
if a.AvatarMediaAttachment != nil {
@@ -123,7 +122,7 @@ func (c *converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
if err == nil {
a.HeaderMediaAttachment = avi
} else {
- logrus.Errorf("AccountToAPIAccountPublic: error getting Header with id %s: %s", a.HeaderMediaAttachmentID, err)
+ log.Errorf("AccountToAPIAccountPublic: error getting Header with id %s: %s", a.HeaderMediaAttachmentID, err)
}
}
if a.HeaderMediaAttachment != nil {
@@ -388,7 +387,7 @@ func (c *converter) StatusToAPIStatus(ctx context.Context, s *gtsmodel.Status, r
for _, gtsAttachment := range s.Attachments {
apiAttachment, err := c.AttachmentToAPIAttachment(ctx, gtsAttachment)
if err != nil {
- logrus.Errorf("error converting attachment with id %s: %s", gtsAttachment.ID, err)
+ log.Errorf("error converting attachment with id %s: %s", gtsAttachment.ID, err)
continue
}
apiAttachments = append(apiAttachments, apiAttachment)
@@ -399,12 +398,12 @@ func (c *converter) StatusToAPIStatus(ctx context.Context, s *gtsmodel.Status, r
for _, aID := range s.AttachmentIDs {
gtsAttachment, err := c.db.GetAttachmentByID(ctx, aID)
if err != nil {
- logrus.Errorf("error getting attachment with id %s: %s", aID, err)
+ log.Errorf("error getting attachment with id %s: %s", aID, err)
continue
}
apiAttachment, err := c.AttachmentToAPIAttachment(ctx, gtsAttachment)
if err != nil {
- logrus.Errorf("error converting attachment with id %s: %s", aID, err)
+ log.Errorf("error converting attachment with id %s: %s", aID, err)
continue
}
apiAttachments = append(apiAttachments, apiAttachment)
@@ -418,7 +417,7 @@ func (c *converter) StatusToAPIStatus(ctx context.Context, s *gtsmodel.Status, r
for _, gtsMention := range s.Mentions {
apiMention, err := c.MentionToAPIMention(ctx, gtsMention)
if err != nil {
- logrus.Errorf("error converting mention with id %s: %s", gtsMention.ID, err)
+ log.Errorf("error converting mention with id %s: %s", gtsMention.ID, err)
continue
}
apiMentions = append(apiMentions, apiMention)
@@ -429,12 +428,12 @@ func (c *converter) StatusToAPIStatus(ctx context.Context, s *gtsmodel.Status, r
for _, mID := range s.MentionIDs {
gtsMention, err := c.db.GetMention(ctx, mID)
if err != nil {
- logrus.Errorf("error getting mention with id %s: %s", mID, err)
+ log.Errorf("error getting mention with id %s: %s", mID, err)
continue
}
apiMention, err := c.MentionToAPIMention(ctx, gtsMention)
if err != nil {
- logrus.Errorf("error converting mention with id %s: %s", gtsMention.ID, err)
+ log.Errorf("error converting mention with id %s: %s", gtsMention.ID, err)
continue
}
apiMentions = append(apiMentions, apiMention)
@@ -448,7 +447,7 @@ func (c *converter) StatusToAPIStatus(ctx context.Context, s *gtsmodel.Status, r
for _, gtsTag := range s.Tags {
apiTag, err := c.TagToAPITag(ctx, gtsTag)
if err != nil {
- logrus.Errorf("error converting tag with id %s: %s", gtsTag.ID, err)
+ log.Errorf("error converting tag with id %s: %s", gtsTag.ID, err)
continue
}
apiTags = append(apiTags, apiTag)
@@ -459,12 +458,12 @@ func (c *converter) StatusToAPIStatus(ctx context.Context, s *gtsmodel.Status, r
for _, t := range s.TagIDs {
gtsTag := >smodel.Tag{}
if err := c.db.GetByID(ctx, t, gtsTag); err != nil {
- logrus.Errorf("error getting tag with id %s: %s", t, err)
+ log.Errorf("error getting tag with id %s: %s", t, err)
continue
}
apiTag, err := c.TagToAPITag(ctx, gtsTag)
if err != nil {
- logrus.Errorf("error converting tag with id %s: %s", gtsTag.ID, err)
+ log.Errorf("error converting tag with id %s: %s", gtsTag.ID, err)
continue
}
apiTags = append(apiTags, apiTag)
@@ -478,7 +477,7 @@ func (c *converter) StatusToAPIStatus(ctx context.Context, s *gtsmodel.Status, r
for _, gtsEmoji := range s.Emojis {
apiEmoji, err := c.EmojiToAPIEmoji(ctx, gtsEmoji)
if err != nil {
- logrus.Errorf("error converting emoji with id %s: %s", gtsEmoji.ID, err)
+ log.Errorf("error converting emoji with id %s: %s", gtsEmoji.ID, err)
continue
}
apiEmojis = append(apiEmojis, apiEmoji)
@@ -489,12 +488,12 @@ func (c *converter) StatusToAPIStatus(ctx context.Context, s *gtsmodel.Status, r
for _, e := range s.EmojiIDs {
gtsEmoji := >smodel.Emoji{}
if err := c.db.GetByID(ctx, e, gtsEmoji); err != nil {
- logrus.Errorf("error getting emoji with id %s: %s", e, err)
+ log.Errorf("error getting emoji with id %s: %s", e, err)
continue
}
apiEmoji, err := c.EmojiToAPIEmoji(ctx, gtsEmoji)
if err != nil {
- logrus.Errorf("error converting emoji with id %s: %s", gtsEmoji.ID, err)
+ log.Errorf("error converting emoji with id %s: %s", gtsEmoji.ID, err)
continue
}
apiEmojis = append(apiEmojis, apiEmoji)
diff --git a/internal/typeutils/wrap.go b/internal/typeutils/wrap.go
index 81e8e53de..c81bf14f1 100644
--- a/internal/typeutils/wrap.go
+++ b/internal/typeutils/wrap.go
@@ -14,7 +14,6 @@ import (
)
func (c *converter) WrapPersonInUpdate(person vocab.ActivityStreamsPerson, originAccount *gtsmodel.Account) (vocab.ActivityStreamsUpdate, error) {
-
update := streams.NewActivityStreamsUpdate()
// set the actor
diff --git a/internal/validate/account_test.go b/internal/validate/account_test.go
index 0aa4a5a9d..a023b2bcb 100644
--- a/internal/validate/account_test.go
+++ b/internal/validate/account_test.go
@@ -31,7 +31,6 @@ import (
)
func happyAccount() *gtsmodel.Account {
-
priv, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
panic(err)
diff --git a/internal/visibility/statusboostable.go b/internal/visibility/statusboostable.go
index 9eed9e3e9..60699875d 100644
--- a/internal/visibility/statusboostable.go
+++ b/internal/visibility/statusboostable.go
@@ -23,15 +23,11 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (f *filter) StatusBoostable(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "StatusBoostable",
- })
-
// if the status isn't visible, it certainly isn't boostable
visible, err := f.StatusVisible(ctx, targetStatus, requestingAccount)
if err != nil {
@@ -43,23 +39,23 @@ func (f *filter) StatusBoostable(ctx context.Context, targetStatus *gtsmodel.Sta
// direct messages are never boostable, even if they're visible
if targetStatus.Visibility == gtsmodel.VisibilityDirect {
- l.Trace("status is not boostable because it is a DM")
+ log.Trace("status is not boostable because it is a DM")
return false, nil
}
// the original account should always be able to boost its own non-DM statuses
if requestingAccount.ID == targetStatus.Account.ID {
- l.Trace("status is boostable because author is booster")
+ log.Trace("status is boostable because author is booster")
return true, nil
}
// if status is followers-only and not the author's, it is not boostable
if targetStatus.Visibility == gtsmodel.VisibilityFollowersOnly {
- l.Trace("status not boostable because it is followers-only")
+ log.Trace("status not boostable because it is followers-only")
return false, nil
}
// otherwise, status is as boostable as it says it is
- l.Trace("defaulting to status.boostable value")
+ log.Trace("defaulting to status.boostable value")
return targetStatus.Boostable, nil
}
diff --git a/internal/visibility/statushometimelineable.go b/internal/visibility/statushometimelineable.go
index af871bcaa..bd3c90b4d 100644
--- a/internal/visibility/statushometimelineable.go
+++ b/internal/visibility/statushometimelineable.go
@@ -22,15 +22,16 @@ import (
"context"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (f *filter) StatusHometimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "StatusHometimelineable",
- "statusID": targetStatus.ID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"statusID", targetStatus.ID},
+ }...)
// status owner should always be able to see their own status in their timeline so we can return early if this is the case
if targetStatus.AccountID == timelineOwnerAccount.ID {
diff --git a/internal/visibility/statuspublictimelineable.go b/internal/visibility/statuspublictimelineable.go
index 9991a9c3a..848842225 100644
--- a/internal/visibility/statuspublictimelineable.go
+++ b/internal/visibility/statuspublictimelineable.go
@@ -22,15 +22,16 @@ import (
"context"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (f *filter) StatusPublictimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "StatusPublictimelineable",
- "statusID": targetStatus.ID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"statusID", targetStatus.ID},
+ }...)
// Don't timeline boosted statuses
if targetStatus.BoostOfID != "" {
diff --git a/internal/visibility/statusvisible.go b/internal/visibility/statusvisible.go
index 3d179eccd..fc8bfeaaa 100644
--- a/internal/visibility/statusvisible.go
+++ b/internal/visibility/statusvisible.go
@@ -22,18 +22,19 @@ import (
"context"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (f *filter) StatusVisible(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) {
const getBoosted = true
- l := logrus.WithFields(logrus.Fields{
- "func": "StatusVisible",
- "statusID": targetStatus.ID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"statusID", targetStatus.ID},
+ }...)
// Fetch any relevant accounts for the target status
relevantAccounts, err := f.relevantAccounts(ctx, targetStatus, getBoosted)
diff --git a/internal/web/assetscache.go b/internal/web/assetscache.go
index 2bde7c499..57a0ade0b 100644
--- a/internal/web/assetscache.go
+++ b/internal/web/assetscache.go
@@ -30,7 +30,7 @@ import (
"time"
"github.com/gin-gonic/gin"
- "github.com/sirupsen/logrus"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
type eTagCacheEntry struct {
@@ -119,7 +119,7 @@ func (m *Module) cacheControlMiddleware(fs http.FileSystem) gin.HandlerFunc {
// either fetch etag from ttlcache or generate it
eTag, err := m.getAssetETag(assetFilePath, fs)
if err != nil {
- logrus.Errorf("error getting ETag for %s: %s", assetFilePath, err)
+ log.Errorf("error getting ETag for %s: %s", assetFilePath, err)
return
}
diff --git a/scripts/build.sh b/scripts/build.sh
index a71a0899a..dde199549 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -6,6 +6,6 @@ set -eu
DEBUG() { [ ! -z "${DEBUG-}" ]; }
CGO_ENABLED=0 go build -trimpath \
- -tags "netgo osusergo static_build $(DEBUG && echo 'debugenv')" \
+ -tags "netgo osusergo static_build kvformat $(DEBUG && echo 'debugenv')" \
-ldflags="-s -w -extldflags '-static' -X 'main.Version=${VERSION:-$(git describe --tags --abbrev=0)}'" \
./cmd/gotosocial
diff --git a/scripts/test.sh b/scripts/test.sh
index befc82adf..5e9271821 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -7,7 +7,7 @@ set -e
# "./..." = all tests
# run tests with sqlite in-memory database
-GTS_DB_TYPE="sqlite" GTS_DB_ADDRESS=":memory:" go test -count 1 ./...
+GTS_DB_TYPE="sqlite" GTS_DB_ADDRESS=":memory:" go test -tags "netgo osusergo static_build kvformat" -count 1 ./...
# run tests with postgres database at either GTS_DB_ADDRESS or default localhost
-GTS_DB_TYPE="postgres" GTS_DB_ADDRESS="${GTS_DB_ADDRESS:-localhost}" go test -count 1 -p 1 ./...
+GTS_DB_TYPE="postgres" GTS_DB_ADDRESS="${GTS_DB_ADDRESS:-localhost}" go test -tags "netgo osusergo static_build kvformat" -count 1 -p 1 ./...
diff --git a/testrig/db.go b/testrig/db.go
index b4c05d727..ae3132835 100644
--- a/testrig/db.go
+++ b/testrig/db.go
@@ -23,11 +23,11 @@ import (
"os"
"strconv"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/db/bundb"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
var testModels = []interface{}{
@@ -91,7 +91,7 @@ func NewTestDB() db.DB {
testDB, err := bundb.NewBunDBService(context.Background())
if err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
return testDB
}
@@ -101,7 +101,7 @@ func CreateTestTables(db db.DB) {
ctx := context.Background()
for _, m := range testModels {
if err := db.CreateTable(ctx, m); err != nil {
- logrus.Panicf("error creating table for %+v: %s", m, err)
+ log.Panicf("error creating table for %+v: %s", m, err)
}
}
}
@@ -116,7 +116,7 @@ func CreateTestTables(db db.DB) {
// verification will fail.
func StandardDBSetup(db db.DB, accounts map[string]*gtsmodel.Account) {
if db == nil {
- logrus.Panic("db setup: db was nil")
+ log.Panic("db setup: db was nil")
}
CreateTestTables(db)
@@ -125,128 +125,128 @@ func StandardDBSetup(db db.DB, accounts map[string]*gtsmodel.Account) {
for _, v := range NewTestTokens() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestClients() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestApplications() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestBlocks() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestDomainBlocks() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestInstances() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestUsers() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
if accounts == nil {
for _, v := range NewTestAccounts() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
} else {
for _, v := range accounts {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
}
for _, v := range NewTestAttachments() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestStatuses() {
if err := db.PutStatus(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestEmojis() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestTags() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestMentions() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestFaves() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestFollows() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
for _, v := range NewTestNotifications() {
if err := db.Put(ctx, v); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
if err := db.CreateInstanceAccount(ctx); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
if err := db.CreateInstanceInstance(ctx); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
- logrus.Debug("testing db setup complete")
+ log.Debug("testing db setup complete")
}
// StandardDBTeardown drops all the standard testing tables/models from the database to ensure it's clean for the next test.
func StandardDBTeardown(db db.DB) {
ctx := context.Background()
if db == nil {
- logrus.Panic("db teardown: db was nil")
+ log.Panic("db teardown: db was nil")
}
for _, m := range testModels {
if err := db.DropTable(ctx, m); err != nil {
- logrus.Panic(err)
+ log.Panic(err)
}
}
}
diff --git a/testrig/log.go b/testrig/log.go
index 1dbba83b5..48e335297 100644
--- a/testrig/log.go
+++ b/testrig/log.go
@@ -19,6 +19,7 @@
package testrig
import (
+ "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/log"
"gopkg.in/mcuadros/go-syslog.v2"
"gopkg.in/mcuadros/go-syslog.v2/format"
@@ -26,8 +27,19 @@ import (
// InitTestLog sets the global logger to trace level for logging
func InitTestLog() {
- if err := log.Initialize(); err != nil {
- panic(err)
+ // Set the global log level from configuration
+ if err := log.ParseLevel(config.GetLogLevel()); err != nil {
+ log.Panicf("error parsing log level: %v", err)
+ }
+
+ if config.GetSyslogEnabled() {
+ // Enable logging to syslog
+ if err := log.EnableSyslog(
+ config.GetSyslogProtocol(),
+ config.GetSyslogAddress(),
+ ); err != nil {
+ log.Panicf("error enabling syslogging: %v", err)
+ }
}
}
diff --git a/testrig/transportcontroller.go b/testrig/transportcontroller.go
index 48463c1df..6edf2b52e 100644
--- a/testrig/transportcontroller.go
+++ b/testrig/transportcontroller.go
@@ -25,7 +25,6 @@ import (
"net/http"
"strings"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/activity/streams/vocab"
@@ -33,12 +32,15 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/concurrency"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/federation"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/transport"
)
-const applicationJSON = "application/json"
-const applicationActivityJSON = "application/activity+json"
+const (
+ applicationJSON = "application/json"
+ applicationActivityJSON = "application/activity+json"
+)
// NewTestTransportController returns a test transport controller with the given http client.
//
@@ -171,7 +173,7 @@ func NewMockHTTPClient(do func(req *http.Request) (*http.Response, error), relat
responseContentLength = len(attachment.Data)
}
- logrus.Debugf("returning response %s", string(responseBytes))
+ log.Debugf("returning response %s", string(responseBytes))
reader := bytes.NewReader(responseBytes)
readCloser := io.NopCloser(reader)
return &http.Response{
@@ -264,7 +266,7 @@ func WebfingerResponse(req *http.Request) (responseCode int, responseBytes []byt
}
if wfr == nil {
- logrus.Debugf("webfinger response not available for %s", req.URL)
+ log.Debugf("webfinger response not available for %s", req.URL)
responseCode = http.StatusNotFound
responseBytes = []byte(`{"error":"not found"}`)
responseContentType = applicationJSON
diff --git a/vendor/codeberg.org/gruf/go-kv/LICENSE b/vendor/codeberg.org/gruf/go-kv/LICENSE
new file mode 100644
index 000000000..b7c4417ac
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/LICENSE
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2021 gruf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/codeberg.org/gruf/go-kv/README.md b/vendor/codeberg.org/gruf/go-kv/README.md
new file mode 100644
index 000000000..fa4735868
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/README.md
@@ -0,0 +1,9 @@
+# go-kv
+
+This library provides a key-value field structure `kv.Field{}` that plays well with the `"fmt"` package. It gives an easy means of appending key-value fields to log entries, in a manner that also happens to look nice! (it's not far removed from using a `map[string]interface{}`).
+
+The formatting for these key-value fields is handled by the `"fmt"` package by default. If you set the `kvformat` build tag then it will use a custom formatting library found under `format/`. You can see the benchmarks for both below.
+
+
+
+TODO: benchmarks comparing these to using `fmt.Sprintf("%q=%+v", ...)` yourself.
\ No newline at end of file
diff --git a/vendor/codeberg.org/gruf/go-kv/benchmark.png b/vendor/codeberg.org/gruf/go-kv/benchmark.png
new file mode 100644
index 000000000..08d838643
Binary files /dev/null and b/vendor/codeberg.org/gruf/go-kv/benchmark.png differ
diff --git a/vendor/codeberg.org/gruf/go-kv/field.go b/vendor/codeberg.org/gruf/go-kv/field.go
new file mode 100644
index 000000000..7ff6f1ca3
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/field.go
@@ -0,0 +1,105 @@
+package kv
+
+import (
+ "codeberg.org/gruf/go-byteutil"
+)
+
+// bufsize is the default buffer size per field to alloc
+// when calling .AppendFormat() from within .String().
+const bufsize = 64
+
+// Fields is a typedef for a []Field slice to provide
+// slightly more performant string formatting for multiples.
+type Fields []Field
+
+// Get will return the field with given 'key'.
+func (f Fields) Get(key string) (*Field, bool) {
+ for i := 0; i < len(f); i++ {
+ if f[i].K == key {
+ return &f[i], true
+ }
+ }
+ return nil, false
+}
+
+// Set will set an existing field with 'key' to 'value', or append new.
+func (f *Fields) Set(key string, value interface{}) {
+ for i := 0; i < len(*f); i++ {
+ // Update existing value
+ if (*f)[i].K == key {
+ (*f)[i].V = value
+ return
+ }
+ }
+
+ // Append new field
+ *f = append(*f, Field{
+ K: key,
+ V: value,
+ })
+}
+
+// AppendFormat appends a string representation of receiving Field(s) to 'b'.
+func (f Fields) AppendFormat(buf *byteutil.Buffer, vbose bool) {
+ for i := 0; i < len(f); i++ {
+ f[i].AppendFormat(buf, vbose)
+ buf.WriteByte(' ')
+ }
+ if len(f) > 0 {
+ buf.Truncate(1)
+ }
+}
+
+// String returns a string representation of receiving Field(s).
+func (f Fields) String() string {
+ b := make([]byte, 0, bufsize*len(f))
+ buf := byteutil.Buffer{B: b}
+ f.AppendFormat(&buf, false)
+ return buf.String()
+}
+
+// GoString performs .String() but with type prefix.
+func (f Fields) GoString() string {
+ b := make([]byte, 0, bufsize*len(f))
+ buf := byteutil.Buffer{B: b}
+ f.AppendFormat(&buf, true)
+ return "kv.Fields{" + buf.String() + "}"
+}
+
+// Field represents an individual key-value field.
+type Field struct {
+ K string // Field key
+ V interface{} // Field value
+}
+
+// Key returns the formatted key string of this Field.
+func (f Field) Key() string {
+ buf := byteutil.Buffer{B: make([]byte, 0, bufsize/2)}
+ appendQuoteKey(&buf, f.K)
+ return buf.String()
+}
+
+// String will return a string representation of this Field
+// of the form `key=value` where `value` is formatted using
+// fmt package's `%+v` directive. If the .X = true (verbose),
+// then it uses '%#v'. Both key and value are escaped and
+// quoted if necessary to fit on single line.
+//
+// If the `kvformat` build tag is provided, the formatting
+// will be performed by the `kv/format` package. In this case
+// the value will be formatted using the `{:v}` directive, or
+// `{:?}` if .X = true (verbose).
+func (f Field) String() string {
+ b := make([]byte, 0, bufsize)
+ buf := byteutil.Buffer{B: b}
+ f.AppendFormat(&buf, false)
+ return buf.String()
+}
+
+// GoString performs .String() but with verbose always enabled.
+func (f Field) GoString() string {
+ b := make([]byte, 0, bufsize)
+ buf := byteutil.Buffer{B: b}
+ f.AppendFormat(&buf, true)
+ return buf.String()
+}
diff --git a/vendor/codeberg.org/gruf/go-kv/field_fmt.go b/vendor/codeberg.org/gruf/go-kv/field_fmt.go
new file mode 100644
index 000000000..c62393fe0
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/field_fmt.go
@@ -0,0 +1,36 @@
+//go:build !kvformat
+// +build !kvformat
+
+package kv
+
+import (
+ "fmt"
+
+ "codeberg.org/gruf/go-byteutil"
+)
+
+// AppendFormat will append formatted format of Field to 'buf'. See .String() for details.
+func (f Field) AppendFormat(buf *byteutil.Buffer, vbose bool) {
+ var fmtstr string
+ if vbose /* verbose */ {
+ fmtstr = `%#v`
+ } else /* regular */ {
+ fmtstr = `%+v`
+ }
+ appendQuoteKey(buf, f.K)
+ buf.WriteByte('=')
+ appendQuoteValue(buf, fmt.Sprintf(fmtstr, f.V))
+}
+
+// Value returns the formatted value string of this Field.
+func (f Field) Value(vbose bool) string {
+ var fmtstr string
+ if vbose /* verbose */ {
+ fmtstr = `%#v`
+ } else /* regular */ {
+ fmtstr = `%+v`
+ }
+ buf := byteutil.Buffer{B: make([]byte, 0, bufsize/2)}
+ appendQuoteValue(&buf, fmt.Sprintf(fmtstr, f.V))
+ return buf.String()
+}
diff --git a/vendor/codeberg.org/gruf/go-kv/field_format.go b/vendor/codeberg.org/gruf/go-kv/field_format.go
new file mode 100644
index 000000000..db1ffc721
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/field_format.go
@@ -0,0 +1,35 @@
+//go:build kvformat
+// +build kvformat
+
+package kv
+
+import (
+ "codeberg.org/gruf/go-byteutil"
+ "codeberg.org/gruf/go-kv/format"
+)
+
+// AppendFormat will append formatted format of Field to 'buf'. See .String() for details.
+func (f Field) AppendFormat(buf *byteutil.Buffer, vbose bool) {
+ var fmtstr string
+ if vbose /* verbose */ {
+ fmtstr = "{:?}"
+ } else /* regular */ {
+ fmtstr = "{:v}"
+ }
+ appendQuoteKey(buf, f.K)
+ buf.WriteByte('=')
+ format.Appendf(buf, fmtstr, f.V)
+}
+
+// Value returns the formatted value string of this Field.
+func (f Field) Value(vbose bool) string {
+ var fmtstr string
+ if vbose /* verbose */ {
+ fmtstr = "{:?}"
+ } else /* regular */ {
+ fmtstr = "{:v}"
+ }
+ buf := byteutil.Buffer{B: make([]byte, 0, bufsize/2)}
+ format.Appendf(&buf, fmtstr, f.V)
+ return buf.String()
+}
diff --git a/vendor/codeberg.org/gruf/go-kv/format/README.md b/vendor/codeberg.org/gruf/go-kv/format/README.md
new file mode 100644
index 000000000..fe7b2338d
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/format/README.md
@@ -0,0 +1,5 @@
+String formatting package using Rust-style formatting directives, geared specifcally towards formatting arguments for key-value log output. Provides ONLY default, key, value and verbose formatting directives. For most formatting cases you will be best served by `"fmt"`.
+
+Generally more visually friendly than `"fmt"` and performance is much improved.
+
+
\ No newline at end of file
diff --git a/vendor/codeberg.org/gruf/go-kv/format/benchmark.png b/vendor/codeberg.org/gruf/go-kv/format/benchmark.png
new file mode 100644
index 000000000..7151fbc55
Binary files /dev/null and b/vendor/codeberg.org/gruf/go-kv/format/benchmark.png differ
diff --git a/vendor/codeberg.org/gruf/go-kv/format/format.go b/vendor/codeberg.org/gruf/go-kv/format/format.go
new file mode 100644
index 000000000..df5a94b7c
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/format/format.go
@@ -0,0 +1,922 @@
+package format
+
+import (
+ "reflect"
+ "strconv"
+ "unicode/utf8"
+
+ "codeberg.org/gruf/go-byteutil"
+)
+
+const (
+ // Flag bit constants, note they are prioritised in this order.
+ IsKeyBit = uint8(1) << 0 // set to indicate key formatting
+ VboseBit = uint8(1) << 1 // set to indicate verbose formatting
+ IsValBit = uint8(1) << 2 // set to indicate value formatting
+ PanicBit = uint8(1) << 3 // set after panic to prevent recursion
+)
+
+// format provides formatting of values into a Buffer.
+type format struct {
+ // Flags are the currently set value flags.
+ Flags uint8
+
+ // Derefs is the current value dereference count.
+ Derefs uint8
+
+ // CurDepth is the current Format iterator depth.
+ CurDepth uint8
+
+ // VType is the current value type.
+ VType string
+
+ // Config is the set Formatter config (MUST NOT be nil).
+ Config *Formatter
+
+ // Buffer is the currently set output buffer.
+ Buffer *byteutil.Buffer
+}
+
+// AtMaxDepth returns whether format is currently at max depth.
+func (f format) AtMaxDepth() bool {
+ return f.CurDepth > f.Config.MaxDepth
+}
+
+// Key returns whether the isKey flag is set.
+func (f format) Key() bool {
+ return (f.Flags & IsKeyBit) != 0
+}
+
+// Value returns whether the isVal flag is set.
+func (f format) Value() bool {
+ return (f.Flags & IsValBit) != 0
+}
+
+// Verbose returns whether the verbose flag is set.
+func (f format) Verbose() bool {
+ return (f.Flags & VboseBit) != 0
+}
+
+// Panic returns whether the panic flag is set.
+func (f format) Panic() bool {
+ return (f.Flags & PanicBit) != 0
+}
+
+// SetKey returns format instance with the IsKey bit set to true,
+// note this resets the dereference count.
+func (f format) SetKey() format {
+ flags := f.Flags | IsKeyBit
+ flags &= ^IsValBit
+ return format{
+ Flags: flags,
+ CurDepth: f.CurDepth,
+ Config: f.Config,
+ Buffer: f.Buffer,
+ }
+}
+
+// SetValue returns format instance with the IsVal bit set to true,
+// note this resets the dereference count.
+func (f format) SetValue() format {
+ flags := f.Flags | IsValBit
+ flags &= ^IsKeyBit
+ return format{
+ Flags: flags,
+ CurDepth: f.CurDepth,
+ Config: f.Config,
+ Buffer: f.Buffer,
+ }
+}
+
+// SetVerbose returns format instance with the Vbose bit set to true,
+// note this resets the dereference count.
+func (f format) SetVerbose() format {
+ return format{
+ Flags: f.Flags | VboseBit,
+ CurDepth: f.CurDepth,
+ Config: f.Config,
+ Buffer: f.Buffer,
+ }
+}
+
+// SetPanic returns format instance with the panic bit set to true,
+// note this resets the dereference count and sets IsVal (unsetting IsKey) bit.
+func (f format) SetPanic() format {
+ flags := f.Flags | PanicBit
+ flags |= IsValBit
+ flags &= ^IsKeyBit
+ return format{
+ Flags: flags,
+ CurDepth: f.CurDepth,
+ Config: f.Config,
+ Buffer: f.Buffer,
+ }
+}
+
+// IncrDepth returns format instance with depth incremented and derefs reset.
+func (f format) IncrDepth() format {
+ return format{
+ Flags: f.Flags,
+ Derefs: f.Derefs,
+ CurDepth: f.CurDepth + 1,
+ Config: f.Config,
+ Buffer: f.Buffer,
+ }
+}
+
+// IncrDerefs returns format instance with dereference count incremented.
+func (f format) IncrDerefs() format {
+ return format{
+ Flags: f.Flags,
+ Derefs: f.Derefs + 1,
+ CurDepth: f.CurDepth,
+ Config: f.Config,
+ Buffer: f.Buffer,
+ }
+}
+
+func (f format) AppendType() {
+ const derefs = `********************************` +
+ `********************************` +
+ `********************************` +
+ `********************************` +
+ `********************************` +
+ `********************************` +
+ `********************************` +
+ `********************************`
+ f.Buffer.B = append(f.Buffer.B, derefs[:f.Derefs]...)
+ f.Buffer.B = append(f.Buffer.B, f.VType...)
+}
+
+func (f format) AppendNil() {
+ if !f.Verbose() {
+ f.Buffer.B = append(f.Buffer.B, `nil`...)
+ return
+ }
+
+ // Append nil with type
+ f.Buffer.B = append(f.Buffer.B, '(')
+ f.AppendType()
+ f.Buffer.B = append(f.Buffer.B, `)(nil`...)
+ f.Buffer.B = append(f.Buffer.B, ')')
+}
+
+func (f format) AppendByte(b byte) {
+ switch {
+ // Always quoted
+ case f.Key():
+ f.Buffer.B = append(f.Buffer.B, '\'')
+ f.Buffer.B = append(f.Buffer.B, byte2str(b)...)
+ f.Buffer.B = append(f.Buffer.B, '\'')
+
+ // Always quoted ASCII with type
+ case f.Verbose():
+ f._AppendPrimitiveTyped(func(f format) {
+ f.Buffer.B = append(f.Buffer.B, '\'')
+ f.Buffer.B = append(f.Buffer.B, byte2str(b)...)
+ f.Buffer.B = append(f.Buffer.B, '\'')
+ })
+
+ // Always quoted
+ case f.Value():
+ f.Buffer.B = append(f.Buffer.B, '\'')
+ f.Buffer.B = append(f.Buffer.B, byte2str(b)...)
+ f.Buffer.B = append(f.Buffer.B, '\'')
+
+ // Append as raw byte
+ default:
+ f.Buffer.B = append(f.Buffer.B, b)
+ }
+}
+
+func (f format) AppendBytes(b []byte) {
+ switch {
+ // Bytes CAN be nil formatted
+ case b == nil:
+ f.AppendNil()
+
+ // Handle bytes as string key
+ case f.Key():
+ f.AppendStringKey(b2s(b))
+
+ // Append as separate ASCII quoted bytes in slice
+ case f.Verbose():
+ f._AppendArrayTyped(func(f format) {
+ for i := 0; i < len(b); i++ {
+ f.Buffer.B = append(f.Buffer.B, '\'')
+ f.Buffer.B = append(f.Buffer.B, byte2str(b[i])...)
+ f.Buffer.B = append(f.Buffer.B, `',`...)
+ }
+ if len(b) > 0 {
+ f.Buffer.Truncate(1)
+ }
+ })
+
+ // Append as quoted string
+ case f.Value():
+ f.AppendStringQuoted(b2s(b))
+
+ // Append as raw bytes
+ default:
+ f.Buffer.B = append(f.Buffer.B, b...)
+ }
+}
+
+func (f format) AppendRune(r rune) {
+ switch {
+ // Quoted only if spaces/requires escaping
+ case f.Key():
+ f.AppendRuneKey(r)
+
+ // Always quoted ASCII with type
+ case f.Verbose():
+ f._AppendPrimitiveTyped(func(f format) {
+ f.Buffer.B = strconv.AppendQuoteRuneToASCII(f.Buffer.B, r)
+ })
+
+ // Always quoted value
+ case f.Value():
+ f.Buffer.B = strconv.AppendQuoteRune(f.Buffer.B, r)
+
+ // Append as raw rune
+ default:
+ f.Buffer.WriteRune(r)
+ }
+}
+
+func (f format) AppendRuneKey(r rune) {
+ if utf8.RuneLen(r) > 1 && (r < ' ' && r != '\t') || r == '`' || r == '\u007F' {
+ // Quote and escape this rune
+ f.Buffer.B = strconv.AppendQuoteRuneToASCII(f.Buffer.B, r)
+ } else {
+ // Simply append rune
+ f.Buffer.WriteRune(r)
+ }
+}
+
+func (f format) AppendRunes(r []rune) {
+ switch {
+ // Runes CAN be nil formatted
+ case r == nil:
+ f.AppendNil()
+
+ // Handle bytes as string key
+ case f.Key():
+ f.AppendStringKey(string(r))
+
+ // Append as separate ASCII quoted bytes in slice
+ case f.Verbose():
+ f._AppendArrayTyped(func(f format) {
+ for i := 0; i < len(r); i++ {
+ f.Buffer.B = strconv.AppendQuoteRuneToASCII(f.Buffer.B, r[i])
+ f.Buffer.B = append(f.Buffer.B, ',')
+ }
+ if len(r) > 0 {
+ f.Buffer.Truncate(1)
+ }
+ })
+
+ // Append as quoted string
+ case f.Value():
+ f.AppendStringQuoted(string(r))
+
+ // Append as raw bytes
+ default:
+ for i := 0; i < len(r); i++ {
+ f.Buffer.WriteRune(r[i])
+ }
+ }
+}
+
+func (f format) AppendString(s string) {
+ switch {
+ // Quoted only if spaces/requires escaping
+ case f.Key():
+ f.AppendStringKey(s)
+
+ // Always quoted with type
+ case f.Verbose():
+ f._AppendPrimitiveTyped(func(f format) {
+ f.AppendStringQuoted(s)
+ })
+
+ // Always quoted string
+ case f.Value():
+ f.AppendStringQuoted(s)
+
+ // All else
+ default:
+ f.Buffer.B = append(f.Buffer.B, s...)
+ }
+}
+
+func (f format) AppendStringKey(s string) {
+ if !strconv.CanBackquote(s) {
+ // Requires quoting AND escaping
+ f.Buffer.B = strconv.AppendQuote(f.Buffer.B, s)
+ } else if ContainsDoubleQuote(s) {
+ // Contains double quotes, needs escaping
+ f.Buffer.B = AppendEscape(f.Buffer.B, s)
+ } else if len(s) < 1 || ContainsSpaceOrTab(s) {
+ // Contains space, needs quotes
+ f.Buffer.B = append(f.Buffer.B, '"')
+ f.Buffer.B = append(f.Buffer.B, s...)
+ f.Buffer.B = append(f.Buffer.B, '"')
+ } else {
+ // All else write as-is
+ f.Buffer.B = append(f.Buffer.B, s...)
+ }
+}
+
+func (f format) AppendStringQuoted(s string) {
+ if !strconv.CanBackquote(s) {
+ // Requires quoting AND escaping
+ f.Buffer.B = strconv.AppendQuote(f.Buffer.B, s)
+ } else if ContainsDoubleQuote(s) {
+ // Contains double quotes, needs escaping
+ f.Buffer.B = append(f.Buffer.B, '"')
+ f.Buffer.B = AppendEscape(f.Buffer.B, s)
+ f.Buffer.B = append(f.Buffer.B, '"')
+ } else {
+ // Simply append with quotes
+ f.Buffer.B = append(f.Buffer.B, '"')
+ f.Buffer.B = append(f.Buffer.B, s...)
+ f.Buffer.B = append(f.Buffer.B, '"')
+ }
+}
+
+func (f format) AppendBool(b bool) {
+ if f.Verbose() {
+ // Append as bool with type information
+ f._AppendPrimitiveTyped(func(f format) {
+ f.Buffer.B = strconv.AppendBool(f.Buffer.B, b)
+ })
+ } else {
+ // Simply append as bool
+ f.Buffer.B = strconv.AppendBool(f.Buffer.B, b)
+ }
+}
+
+func (f format) AppendInt(i int64) {
+ f._AppendPrimitiveType(func(f format) {
+ f.Buffer.B = strconv.AppendInt(f.Buffer.B, i, 10)
+ })
+}
+
+func (f format) AppendUint(u uint64) {
+ f._AppendPrimitiveType(func(f format) {
+ f.Buffer.B = strconv.AppendUint(f.Buffer.B, u, 10)
+ })
+}
+
+func (f format) AppendFloat(l float64) {
+ f._AppendPrimitiveType(func(f format) {
+ f.AppendFloatValue(l)
+ })
+}
+
+func (f format) AppendFloatValue(l float64) {
+ f.Buffer.B = strconv.AppendFloat(f.Buffer.B, l, 'f', -1, 64)
+}
+
+func (f format) AppendComplex(c complex128) {
+ f._AppendPrimitiveType(func(f format) {
+ f.AppendFloatValue(real(c))
+ f.Buffer.B = append(f.Buffer.B, '+')
+ f.AppendFloatValue(imag(c))
+ f.Buffer.B = append(f.Buffer.B, 'i')
+ })
+}
+
+func (f format) AppendPtr(u uint64) {
+ f._AppendPtrType(func(f format) {
+ if u == 0 {
+ // Append as nil
+ f.Buffer.B = append(f.Buffer.B, `nil`...)
+ } else {
+ // Append as hex number
+ f.Buffer.B = append(f.Buffer.B, `0x`...)
+ f.Buffer.B = strconv.AppendUint(f.Buffer.B, u, 16)
+ }
+ })
+}
+
+func (f format) AppendInterfaceOrReflect(i interface{}) {
+ if !f.AppendInterface(i) {
+ // Interface append failed, used reflected value + type
+ f.AppendReflectValue(reflect.ValueOf(i), reflect.TypeOf(i))
+ }
+}
+
+func (f format) AppendInterfaceOrReflectNext(v reflect.Value, t reflect.Type) {
+ // Check we haven't hit max
+ if f.AtMaxDepth() {
+ f.Buffer.B = append(f.Buffer.B, `...`...)
+ return
+ }
+
+ // Incr the depth
+ f = f.IncrDepth()
+
+ // Make actual call
+ f.AppendReflectOrInterface(v, t)
+}
+
+func (f format) AppendReflectOrInterface(v reflect.Value, t reflect.Type) {
+ if !v.CanInterface() ||
+ !f.AppendInterface(v.Interface()) {
+ // Interface append failed, use reflect
+ f.AppendReflectValue(v, t)
+ }
+}
+
+func (f format) AppendInterface(i interface{}) bool {
+ switch i := i.(type) {
+ // Reflect types
+ case reflect.Type:
+ f.AppendReflectType(i)
+ case reflect.Value:
+ f.Buffer.B = append(f.Buffer.B, `reflect.Value`...)
+ f.Buffer.B = append(f.Buffer.B, '(')
+ f.Buffer.B = append(f.Buffer.B, i.String()...)
+ f.Buffer.B = append(f.Buffer.B, ')')
+
+ // Bytes, runes and string types
+ case rune:
+ f.VType = `int32`
+ f.AppendRune(i)
+ case []rune:
+ f.VType = `[]int32`
+ f.AppendRunes(i)
+ case byte:
+ f.VType = `uint8`
+ f.AppendByte(i)
+ case []byte:
+ f.VType = `[]uint8`
+ f.AppendBytes(i)
+ case string:
+ f.VType = `string`
+ f.AppendString(i)
+
+ // Int types
+ case int:
+ f.VType = `int`
+ f.AppendInt(int64(i))
+ case int8:
+ f.VType = `int8`
+ f.AppendInt(int64(i))
+ case int16:
+ f.VType = `int16`
+ f.AppendInt(int64(i))
+ case int64:
+ f.VType = `int64`
+ f.AppendInt(int64(i))
+
+ // Uint types
+ case uint:
+ f.VType = `uint`
+ f.AppendUint(uint64(i))
+ case uint16:
+ f.VType = `uint16`
+ f.AppendUint(uint64(i))
+ case uint32:
+ f.VType = `uint32`
+ f.AppendUint(uint64(i))
+ case uint64:
+ f.VType = `uint64`
+ f.AppendUint(uint64(i))
+
+ // Float types
+ case float32:
+ f.VType = `float32`
+ f.AppendFloat(float64(i))
+ case float64:
+ f.VType = `float64`
+ f.AppendFloat(float64(i))
+
+ // Bool type
+ case bool:
+ f.VType = `bool`
+ f.AppendBool(i)
+
+ // Complex types
+ case complex64:
+ f.VType = `complex64`
+ f.AppendComplex(complex128(i))
+ case complex128:
+ f.VType = `complex128`
+ f.AppendComplex(complex128(i))
+
+ // Method types
+ case error:
+ return f._AppendMethodType(func() string {
+ return i.Error()
+ }, i)
+ case interface{ String() string }:
+ return f._AppendMethodType(func() string {
+ return i.String()
+ }, i)
+
+ // No quick handler
+ default:
+ return false
+ }
+
+ return true
+}
+
+func (f format) AppendReflectType(t reflect.Type) {
+ switch f.VType = `reflect.Type`; {
+ case isNil(t) /* safer nil check */ :
+ f.AppendNil()
+ case f.Verbose():
+ f.AppendType()
+ f.Buffer.B = append(f.Buffer.B, '(')
+ f.Buffer.B = append(f.Buffer.B, t.String()...)
+ f.Buffer.B = append(f.Buffer.B, ')')
+ default:
+ f.Buffer.B = append(f.Buffer.B, t.String()...)
+ }
+}
+
+func (f format) AppendReflectValue(v reflect.Value, t reflect.Type) {
+ switch v.Kind() {
+ // String/byte types
+ case reflect.String:
+ f.VType = t.String()
+ f.AppendString(v.String())
+ case reflect.Uint8:
+ f.VType = t.String()
+ f.AppendByte(byte(v.Uint()))
+ case reflect.Int32:
+ f.VType = t.String()
+ f.AppendRune(rune(v.Int()))
+
+ // Float tpyes
+ case reflect.Float32, reflect.Float64:
+ f.VType = t.String()
+ f.AppendFloat(v.Float())
+
+ // Int types
+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int64:
+ f.VType = t.String()
+ f.AppendInt(v.Int())
+
+ // Uint types
+ case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+ f.VType = t.String()
+ f.AppendUint(v.Uint())
+
+ // Complex types
+ case reflect.Complex64, reflect.Complex128:
+ f.VType = t.String()
+ f.AppendComplex(v.Complex())
+
+ // Bool type
+ case reflect.Bool:
+ f.VType = t.String()
+ f.AppendBool(v.Bool())
+
+ // Slice and array types
+ case reflect.Array:
+ f.AppendArray(v, t)
+ case reflect.Slice:
+ f.AppendSlice(v, t)
+
+ // Map types
+ case reflect.Map:
+ f.AppendMap(v, t)
+
+ // Struct types
+ case reflect.Struct:
+ f.AppendStruct(v, t)
+
+ // Interface type
+ case reflect.Interface:
+ if v.IsNil() {
+ // Append nil ptr type
+ f.VType = t.String()
+ f.AppendNil()
+ } else {
+ // Append interface
+ v = v.Elem()
+ t = v.Type()
+ f.AppendReflectOrInterface(v, t)
+ }
+
+ // Deref'able ptr type
+ case reflect.Ptr:
+ if v.IsNil() {
+ // Append nil ptr type
+ f.VType = t.String()
+ f.AppendNil()
+ } else {
+ // Deref to next level
+ f = f.IncrDerefs()
+ v, t = v.Elem(), t.Elem()
+ f.AppendReflectOrInterface(v, t)
+ }
+
+ // 'raw' pointer types
+ case reflect.UnsafePointer, reflect.Func, reflect.Chan:
+ f.VType = t.String()
+ f.AppendPtr(uint64(v.Pointer()))
+ case reflect.Uintptr:
+ f.VType = t.String()
+ f.AppendPtr(v.Uint())
+
+ // Zero reflect value
+ case reflect.Invalid:
+ f.Buffer.B = append(f.Buffer.B, `nil`...)
+
+ // All others
+ default:
+ f.VType = t.String()
+ f.AppendType()
+ }
+}
+
+func (f format) AppendSlice(v reflect.Value, t reflect.Type) {
+ // Get slice value type
+ f.VType = t.String()
+
+ if t.Elem().Kind() == reflect.Uint8 {
+ // This is a byte slice
+ f.AppendBytes(v.Bytes())
+ return
+ }
+
+ if v.IsNil() {
+ // Nil slice
+ f.AppendNil()
+ return
+ }
+
+ if f.Verbose() {
+ // Append array with type information
+ f._AppendArrayTyped(func(f format) {
+ f.AppendArrayElems(v, t)
+ })
+ } else {
+ // Simply append array as elems
+ f._AppendArray(func(f format) {
+ f.AppendArrayElems(v, t)
+ })
+ }
+}
+
+func (f format) AppendArray(v reflect.Value, t reflect.Type) {
+ // Get array value type
+ f.VType = t.String()
+
+ if f.Verbose() {
+ // Append array with type information
+ f._AppendArrayTyped(func(f format) {
+ f.AppendArrayElems(v, t)
+ })
+ } else {
+ // Simply append array as elems
+ f._AppendArray(func(f format) {
+ f.AppendArrayElems(v, t)
+ })
+ }
+}
+
+func (f format) AppendArrayElems(v reflect.Value, t reflect.Type) {
+ // Get no. elems
+ n := v.Len()
+
+ // Get elem type
+ et := t.Elem()
+
+ // Append values
+ for i := 0; i < n; i++ {
+ f.SetValue().AppendInterfaceOrReflectNext(v.Index(i), et)
+ f.Buffer.B = append(f.Buffer.B, ',')
+ }
+
+ // Drop last comma
+ if n > 0 {
+ f.Buffer.Truncate(1)
+ }
+}
+
+func (f format) AppendMap(v reflect.Value, t reflect.Type) {
+ // Get value type
+ f.VType = t.String()
+
+ if v.IsNil() {
+ // Nil map -- no fields
+ f.AppendNil()
+ return
+ }
+
+ // Append field formatted map fields
+ f._AppendFieldType(func(f format) {
+ f.AppendMapFields(v, t)
+ })
+}
+
+func (f format) AppendMapFields(v reflect.Value, t reflect.Type) {
+ // Get a map iterator
+ r := v.MapRange()
+ n := v.Len()
+
+ // Get key/val types
+ kt := t.Key()
+ kv := t.Elem()
+
+ // Iterate pairs
+ for r.Next() {
+ f.SetKey().AppendInterfaceOrReflectNext(r.Key(), kt)
+ f.Buffer.B = append(f.Buffer.B, '=')
+ f.SetValue().AppendInterfaceOrReflectNext(r.Value(), kv)
+ f.Buffer.B = append(f.Buffer.B, ' ')
+ }
+
+ // Drop last space
+ if n > 0 {
+ f.Buffer.Truncate(1)
+ }
+}
+
+func (f format) AppendStruct(v reflect.Value, t reflect.Type) {
+ // Get value type
+ f.VType = t.String()
+
+ // Append field formatted struct fields
+ f._AppendFieldType(func(f format) {
+ f.AppendStructFields(v, t)
+ })
+}
+
+func (f format) AppendStructFields(v reflect.Value, t reflect.Type) {
+ // Get field no.
+ n := v.NumField()
+
+ // Iterate struct fields
+ for i := 0; i < n; i++ {
+ vfield := v.Field(i)
+ tfield := t.Field(i)
+
+ // Append field name
+ f.AppendStringKey(tfield.Name)
+ f.Buffer.B = append(f.Buffer.B, '=')
+ f.SetValue().AppendInterfaceOrReflectNext(vfield, tfield.Type)
+
+ // Append separator
+ f.Buffer.B = append(f.Buffer.B, ' ')
+ }
+
+ // Drop last space
+ if n > 0 {
+ f.Buffer.Truncate(1)
+ }
+}
+
+func (f format) _AppendMethodType(method func() string, i interface{}) (ok bool) {
+ // Verbose -- no methods
+ if f.Verbose() {
+ return false
+ }
+
+ // Catch nil type
+ if isNil(i) {
+ f.AppendNil()
+ return true
+ }
+
+ // Catch any panics
+ defer func() {
+ if r := recover(); r != nil {
+ // DON'T recurse catchPanic()
+ if f.Panic() {
+ panic(r)
+ }
+
+ // Attempt to decode panic into buf
+ f.Buffer.B = append(f.Buffer.B, `!{PANIC=`...)
+ f.SetPanic().AppendInterfaceOrReflect(r)
+ f.Buffer.B = append(f.Buffer.B, '}')
+
+ // Ensure no further attempts
+ // to format after return
+ ok = true
+ }
+ }()
+
+ // Get method result
+ result := method()
+
+ switch {
+ // Append as key formatted
+ case f.Key():
+ f.AppendStringKey(result)
+
+ // Append as always quoted
+ case f.Value():
+ f.AppendStringQuoted(result)
+
+ // Append as-is
+ default:
+ f.Buffer.B = append(f.Buffer.B, result...)
+ }
+
+ return true
+}
+
+// _AppendPrimitiveType is a helper to append prefix/suffix for primitives (numbers/bools/bytes/runes).
+func (f format) _AppendPrimitiveType(appendPrimitive func(format)) {
+ if f.Verbose() {
+ // Append value with type information
+ f._AppendPrimitiveTyped(appendPrimitive)
+ } else {
+ // Append simply as-is
+ appendPrimitive(f)
+ }
+}
+
+// _AppendPrimitiveTyped is a helper to append prefix/suffix for primitives (numbers/bools/bytes/runes) with their types (if deref'd).
+func (f format) _AppendPrimitiveTyped(appendPrimitive func(format)) {
+ if f.Derefs > 0 {
+ // Is deref'd, append type info
+ f.Buffer.B = append(f.Buffer.B, '(')
+ f.AppendType()
+ f.Buffer.WriteString(`)(`)
+ appendPrimitive(f)
+ f.Buffer.B = append(f.Buffer.B, ')')
+ } else {
+ // Simply append value
+ appendPrimitive(f)
+ }
+}
+
+// _AppendPtrType is a helper to append prefix/suffix for ptr types (with type if necessary).
+func (f format) _AppendPtrType(appendPtr func(format)) {
+ if f.Verbose() {
+ // Append value with type information
+ f.Buffer.B = append(f.Buffer.B, '(')
+ f.AppendType()
+ f.Buffer.WriteString(`)(`)
+ appendPtr(f)
+ f.Buffer.B = append(f.Buffer.B, ')')
+ } else {
+ // Append simply as-is
+ appendPtr(f)
+ }
+}
+
+// _AppendArray is a helper to append prefix/suffix for array-types.
+func (f format) _AppendArray(appendArray func(format)) {
+ f.Buffer.B = append(f.Buffer.B, '[')
+ appendArray(f)
+ f.Buffer.B = append(f.Buffer.B, ']')
+}
+
+// _AppendArrayTyped is a helper to append prefix/suffix for array-types with their types.
+func (f format) _AppendArrayTyped(appendArray func(format)) {
+ f.AppendType()
+ f.Buffer.B = append(f.Buffer.B, '{')
+ appendArray(f)
+ f.Buffer.B = append(f.Buffer.B, '}')
+}
+
+// _AppendFields is a helper to append prefix/suffix for field-types (with type if necessary).
+func (f format) _AppendFieldType(appendFields func(format)) {
+ if f.Verbose() {
+ f.AppendType()
+ }
+ f.Buffer.B = append(f.Buffer.B, '{')
+ appendFields(f)
+ f.Buffer.B = append(f.Buffer.B, '}')
+}
+
+// byte2str returns 'c' as a string, escaping if necessary.
+func byte2str(c byte) string {
+ switch c {
+ case '\a':
+ return `\a`
+ case '\b':
+ return `\b`
+ case '\f':
+ return `\f`
+ case '\n':
+ return `\n`
+ case '\r':
+ return `\r`
+ case '\t':
+ return `\t`
+ case '\v':
+ return `\v`
+ case '\'':
+ return `\\`
+ default:
+ if c < ' ' {
+ const hex = "0123456789abcdef"
+ return `\x` +
+ string(hex[c>>4]) +
+ string(hex[c&0xF])
+ }
+ return string(c)
+ }
+}
diff --git a/vendor/codeberg.org/gruf/go-kv/format/formatter.go b/vendor/codeberg.org/gruf/go-kv/format/formatter.go
new file mode 100644
index 000000000..fd8cf98df
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/format/formatter.go
@@ -0,0 +1,349 @@
+package format
+
+import (
+ "strconv"
+ "strings"
+
+ "codeberg.org/gruf/go-byteutil"
+)
+
+// Formatter allows configuring value and string formatting.
+type Formatter struct {
+ // MaxDepth specifies the max depth of fields the formatter will iterate.
+ // Once max depth is reached, value will simply be formatted as "...".
+ // e.g.
+ //
+ // MaxDepth=1
+ // type A struct{
+ // Nested B
+ // }
+ // type B struct{
+ // Nested C
+ // }
+ // type C struct{
+ // Field string
+ // }
+ //
+ // Append(&buf, A{}) => {Nested={Nested={Field=...}}}
+ MaxDepth uint8
+}
+
+// Append will append formatted form of supplied values into 'buf'.
+func (f *Formatter) Append(buf *byteutil.Buffer, v ...interface{}) {
+ fmt := format{Buffer: buf, Config: f}
+ for i := 0; i < len(v); i++ {
+ fmt.AppendInterfaceOrReflect(v[i])
+ fmt.Buffer.B = append(fmt.Buffer.B, ' ')
+ }
+ if len(v) > 0 {
+ fmt.Buffer.Truncate(1)
+ }
+}
+
+// Appendf will append the formatted string with supplied values into 'buf'.
+// Supported format directives:
+// - '{}' => format supplied arg, in place
+// - '{0}' => format arg at index 0 of supplied, in place
+// - '{:?}' => format supplied arg verbosely, in place
+// - '{:k}' => format supplied arg as key, in place
+// - '{:v}' => format supplied arg as value, in place
+//
+// To escape either of '{}' simply append an additional brace e.g.
+// - '{{' => '{'
+// - '}}' => '}'
+// - '{{}}' => '{}'
+// - '{{:?}}' => '{:?}'
+//
+// More formatting directives might be included in the future.
+func (f *Formatter) Appendf(buf *byteutil.Buffer, s string, a ...interface{}) {
+ const (
+ // ground state
+ modeNone = uint8(0)
+
+ // prev reached '{'
+ modeOpen = uint8(1)
+
+ // prev reached '}'
+ modeClose = uint8(2)
+
+ // parsing directive index
+ modeIdx = uint8(3)
+
+ // parsing directive operands
+ modeOp = uint8(4)
+ )
+
+ var (
+ // mode is current parsing mode
+ mode uint8
+
+ // arg is the current arg index
+ arg int
+
+ // carg is current directive-set arg index
+ carg int
+
+ // last is the trailing cursor to see slice windows
+ last int
+
+ // idx is the current index in 's'
+ idx int
+
+ // fmt is the base argument formatter
+ fmt = format{
+ Config: f,
+ Buffer: buf,
+ }
+
+ // NOTE: these functions are defined here as function
+ // locals as it turned out to be better for performance
+ // doing it this way, than encapsulating their logic in
+ // some kind of parsing structure. Maybe if the parser
+ // was pooled along with the buffers it might work out
+ // better, but then it makes more internal functions i.e.
+ // .Append() .Appendf() less accessible outside package.
+ //
+ // Currently, passing '-gcflags "-l=4"' causes a not
+ // insignificant decrease in ns/op, which is likely due
+ // to more aggressive function inlining, which this
+ // function can obviously stand to benefit from :)
+
+ // Str returns current string window slice, and updates
+ // the trailing cursor 'last' to current 'idx'
+ Str = func() string {
+ str := s[last:idx]
+ last = idx
+ return str
+ }
+
+ // MoveUp moves the trailing cursor 'last' just past 'idx'
+ MoveUp = func() {
+ last = idx + 1
+ }
+
+ // MoveUpTo moves the trailing cursor 'last' either up to
+ // closest '}', or current 'idx', whichever is furthest.
+ // NOTE: by calling bytealg.IndexByteString() directly (and
+ // not the strconv pass-through, we shave-off complexity
+ // which allows this function to be inlined).
+ MoveUpTo = func() {
+ i := strings.IndexByte(s[idx:], '}')
+ if i >= 0 {
+ idx += i
+ }
+ MoveUp()
+ }
+
+ // ParseIndex parses an integer from the current string
+ // window, updating 'last' to 'idx'. The string window
+ // is ASSUMED to contain only valid ASCII numbers. This
+ // only returns false if number exceeds platform int size
+ ParseIndex = func() bool {
+ var str string
+
+ // Get current window
+ if str = Str(); len(str) < 1 {
+ return true
+ }
+
+ // Index HAS to fit within platform integer size
+ if !(strconv.IntSize == 32 && (0 < len(s) && len(s) < 10)) ||
+ !(strconv.IntSize == 64 && (0 < len(s) && len(s) < 19)) {
+ return false
+ }
+
+ carg = 0
+
+ // Build integer from string
+ for i := 0; i < len(str); i++ {
+ carg = carg*10 + int(str[i]-'0')
+ }
+
+ return true
+ }
+
+ // ValidOp checks that for current ending idx, that a valid
+ // operand was achieved -- only 0, 1 are valid numbers.
+ ValidOp = func() bool {
+ diff := (idx - last)
+ last = idx
+ return diff < 2
+ }
+
+ // AppendArg will take either the directive-set, or
+ // iterated arg index, check within bounds of 'a' and
+ // append the that argument formatted to the buffer.
+ // On failure, it will append an error string
+ AppendArg = func() {
+ // Look for idx
+ if carg < 0 {
+ carg = arg
+ }
+
+ // Incr idx
+ arg++
+
+ if carg < len(a) {
+ // Append formatted argument value
+ fmt.AppendInterfaceOrReflect(a[carg])
+ } else {
+ // No argument found for index
+ fmt.Buffer.B = append(fmt.Buffer.B, `!{MISSING_ARG}`...)
+ }
+ }
+
+ // Reset will reset the mode to ground, the flags
+ // to empty and parsed 'carg' to empty
+ Reset = func() {
+ mode = modeNone
+ fmt.CurDepth = 0
+ fmt.Flags = 0
+ fmt.VType = ""
+ fmt.Derefs = 0
+ carg = -1
+ }
+ )
+
+ for idx = 0; idx < len(s); idx++ {
+ // Get next char
+ c := s[idx]
+
+ switch mode {
+ // Ground mode
+ case modeNone:
+ switch c {
+ case '{':
+ // Enter open mode
+ fmt.Buffer.B = append(fmt.Buffer.B, Str()...)
+ mode = modeOpen
+ MoveUp()
+ case '}':
+ // Enter close mode
+ fmt.Buffer.B = append(fmt.Buffer.B, Str()...)
+ mode = modeClose
+ MoveUp()
+ }
+
+ // Encountered open '{'
+ case modeOpen:
+ switch c {
+ case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+ // Starting index
+ mode = modeIdx
+ MoveUp()
+ case '{':
+ // Escaped bracket
+ fmt.Buffer.B = append(fmt.Buffer.B, '{')
+ mode = modeNone
+ MoveUp()
+ case '}':
+ // Format arg
+ AppendArg()
+ Reset()
+ MoveUp()
+ case ':':
+ // Starting operands
+ mode = modeOp
+ MoveUp()
+ default:
+ // Bad char, missing a close
+ fmt.Buffer.B = append(fmt.Buffer.B, `!{MISSING_CLOSE}`...)
+ mode = modeNone
+ MoveUpTo()
+ }
+
+ // Encountered close '}'
+ case modeClose:
+ switch c {
+ case '}':
+ // Escaped close bracket
+ fmt.Buffer.B = append(fmt.Buffer.B, '}')
+ mode = modeNone
+ MoveUp()
+ default:
+ // Missing an open bracket
+ fmt.Buffer.B = append(fmt.Buffer.B, `!{MISSING_OPEN}`...)
+ mode = modeNone
+ MoveUp()
+ }
+
+ // Preparing index
+ case modeIdx:
+ switch c {
+ case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+ case ':':
+ if !ParseIndex() {
+ // Unable to parse an integer
+ fmt.Buffer.B = append(fmt.Buffer.B, `!{BAD_INDEX}`...)
+ mode = modeNone
+ MoveUpTo()
+ } else {
+ // Starting operands
+ mode = modeOp
+ MoveUp()
+ }
+ case '}':
+ if !ParseIndex() {
+ // Unable to parse an integer
+ fmt.Buffer.B = append(fmt.Buffer.B, `!{BAD_INDEX}`...)
+ } else {
+ // Format arg
+ AppendArg()
+ }
+ Reset()
+ MoveUp()
+ default:
+ // Not a valid index character
+ fmt.Buffer.B = append(fmt.Buffer.B, `!{BAD_INDEX}`...)
+ mode = modeNone
+ MoveUpTo()
+ }
+
+ // Preparing operands
+ case modeOp:
+ switch c {
+ case 'k':
+ fmt.Flags |= IsKeyBit
+ case 'v':
+ fmt.Flags |= IsValBit
+ case '?':
+ fmt.Flags |= VboseBit
+ case '}':
+ if !ValidOp() {
+ // Bad operands parsed
+ fmt.Buffer.B = append(fmt.Buffer.B, `!{BAD_OPERAND}`...)
+ } else {
+ // Format arg
+ AppendArg()
+ }
+ Reset()
+ MoveUp()
+ default:
+ // Not a valid operand char
+ fmt.Buffer.B = append(fmt.Buffer.B, `!{BAD_OPERAND}`...)
+ Reset()
+ MoveUpTo()
+ }
+ }
+ }
+
+ // Append any remaining
+ fmt.Buffer.B = append(fmt.Buffer.B, s[last:]...)
+}
+
+// formatter is the default formatter instance.
+var formatter = Formatter{
+ MaxDepth: 10,
+}
+
+// Append will append formatted form of supplied values into 'buf' using default formatter.
+// See Formatter.Append() for more documentation.
+func Append(buf *byteutil.Buffer, v ...interface{}) {
+ formatter.Append(buf, v...)
+}
+
+// Appendf will append the formatted string with supplied values into 'buf' using default formatter.
+// See Formatter.Appendf() for more documentation.
+func Appendf(buf *byteutil.Buffer, s string, a ...interface{}) {
+ formatter.Appendf(buf, s, a...)
+}
diff --git a/vendor/codeberg.org/gruf/go-kv/format/util.go b/vendor/codeberg.org/gruf/go-kv/format/util.go
new file mode 100644
index 000000000..c4c42329e
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/format/util.go
@@ -0,0 +1,56 @@
+package format
+
+import (
+ "strings"
+ "unsafe"
+)
+
+// ContainsSpaceOrTab checks if "s" contains space or tabs.
+func ContainsSpaceOrTab(s string) bool {
+ if i := strings.IndexByte(s, ' '); i != -1 {
+ return true // note using indexbyte as it is ASM.
+ } else if i := strings.IndexByte(s, '\t'); i != -1 {
+ return true
+ }
+ return false
+}
+
+// ContainsDoubleQuote checks if "s" contains a double quote.
+func ContainsDoubleQuote(s string) bool {
+ return (strings.IndexByte(s, '"') != -1)
+}
+
+// AppendEscape will append 's' to 'dst' and escape any double quotes.
+func AppendEscape(dst []byte, str string) []byte {
+ var delim bool
+ for i := range str {
+ if str[i] == '\\' && !delim {
+ // Set delim flag
+ delim = true
+ continue
+ } else if str[i] == '"' && !delim {
+ // Append escaped double quote
+ dst = append(dst, `\"`...)
+ continue
+ } else if delim {
+ // Append skipped slash
+ dst = append(dst, `\`...)
+ delim = false
+ }
+
+ // Append char as-is
+ dst = append(dst, str[i])
+ }
+ return dst
+}
+
+// isNil will safely check if 'v' is nil without dealing with weird Go interface nil bullshit.
+func isNil(i interface{}) bool {
+ type eface struct{ _type, data unsafe.Pointer } //nolint
+ return (*(*eface)(unsafe.Pointer(&i))).data == nil //nolint
+}
+
+// b2s converts a byteslice to string without allocation.
+func b2s(b []byte) string {
+ return *(*string)(unsafe.Pointer(&b))
+}
diff --git a/vendor/codeberg.org/gruf/go-kv/util.go b/vendor/codeberg.org/gruf/go-kv/util.go
new file mode 100644
index 000000000..a9526bf3d
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-kv/util.go
@@ -0,0 +1,71 @@
+package kv
+
+import (
+ "strconv"
+
+ "codeberg.org/gruf/go-byteutil"
+ "codeberg.org/gruf/go-kv/format"
+)
+
+// appendQuoteKey will append and escape/quote a formatted key string.
+func appendQuoteKey(buf *byteutil.Buffer, str string) {
+ switch {
+ case !strconv.CanBackquote(str):
+ // Append quoted and escaped string
+ buf.B = strconv.AppendQuote(buf.B, str)
+ case format.ContainsDoubleQuote(str):
+ // Double quote and escape string
+ buf.B = append(buf.B, '"')
+ buf.B = format.AppendEscape(buf.B, str)
+ buf.B = append(buf.B, '"')
+ case len(str) < 1 || format.ContainsSpaceOrTab(str):
+ // Double quote this string as-is
+ buf.WriteString(`"` + str + `"`)
+ default:
+ // Append string as-is
+ buf.WriteString(str)
+ }
+}
+
+// appendQuoteValue will append and escape/quote a formatted value string.
+func appendQuoteValue(buf *byteutil.Buffer, str string) {
+ switch {
+ case !strconv.CanBackquote(str):
+ // Append quoted and escaped string
+ buf.B = strconv.AppendQuote(buf.B, str)
+ return
+ case !doubleQuoted(str):
+ if format.ContainsDoubleQuote(str) {
+ // Double quote and escape string
+ buf.B = append(buf.B, '"')
+ buf.B = format.AppendEscape(buf.B, str)
+ buf.B = append(buf.B, '"')
+ return
+ } else if format.ContainsSpaceOrTab(str) {
+ // Double quote this string as-is
+ buf.WriteString(`"` + str + `"`)
+ return
+ }
+ }
+
+ // Append string as-is
+ buf.WriteString(str)
+}
+
+// doubleQuoted will return whether 'str' is double quoted.
+func doubleQuoted(str string) bool {
+ if len(str) < 2 ||
+ str[0] != '"' || str[len(str)-1] != '"' {
+ return false
+ }
+ var delim bool
+ for i := len(str) - 2; i >= 0; i-- {
+ switch str[i] {
+ case '\\':
+ delim = !delim
+ default:
+ return !delim
+ }
+ }
+ return !delim
+}
diff --git a/vendor/codeberg.org/gruf/go-logger/v2/LICENSE b/vendor/codeberg.org/gruf/go-logger/v2/LICENSE
new file mode 100644
index 000000000..e4163ae35
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-logger/v2/LICENSE
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2022 gruf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/codeberg.org/gruf/go-logger/v2/level/levels.go b/vendor/codeberg.org/gruf/go-logger/v2/level/levels.go
new file mode 100644
index 000000000..1804bdb23
--- /dev/null
+++ b/vendor/codeberg.org/gruf/go-logger/v2/level/levels.go
@@ -0,0 +1,49 @@
+package level
+
+// LEVEL defines a level of logging.
+type LEVEL uint8
+
+// Default levels of logging.
+const (
+ UNSET LEVEL = 0
+ PANIC LEVEL = 1
+ FATAL LEVEL = 50
+ ERROR LEVEL = 100
+ WARN LEVEL = 150
+ INFO LEVEL = 200
+ DEBUG LEVEL = 250
+ TRACE LEVEL = 254
+ ALL LEVEL = ^LEVEL(0)
+)
+
+// CanLog returns whether an incoming log of 'lvl' can be logged against receiving level.
+func (loglvl LEVEL) CanLog(lvl LEVEL) bool {
+ return loglvl > lvl
+}
+
+// Levels defines a mapping of log LEVELs to formatted level strings.
+type Levels [int(ALL) + 1]string
+
+// Default returns the default set of log levels.
+func Default() Levels {
+ return Levels{
+ TRACE: "TRACE",
+ DEBUG: "DEBUG",
+ INFO: "INFO",
+ WARN: "WARN",
+ ERROR: "ERROR",
+ FATAL: "FATAL",
+ PANIC: "PANIC",
+
+ // we set these just so that
+ // it can be debugged when someone
+ // attempts to log with ALL/UNSET
+ ALL: "{all}",
+ UNSET: "{unset}",
+ }
+}
+
+// Get fetches the level string for the provided value.
+func (l Levels) Get(lvl LEVEL) string {
+ return l[int(lvl)]
+}
diff --git a/vendor/github.com/sirupsen/logrus/hooks/syslog/README.md b/vendor/github.com/sirupsen/logrus/hooks/syslog/README.md
deleted file mode 100644
index 1bbc0f72d..000000000
--- a/vendor/github.com/sirupsen/logrus/hooks/syslog/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Syslog Hooks for Logrus 
-
-## Usage
-
-```go
-import (
- "log/syslog"
- "github.com/sirupsen/logrus"
- lSyslog "github.com/sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
- log := logrus.New()
- hook, err := lSyslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
- if err == nil {
- log.Hooks.Add(hook)
- }
-}
-```
-
-If you want to connect to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). Just assign empty string to the first two parameters of `NewSyslogHook`. It should look like the following.
-
-```go
-import (
- "log/syslog"
- "github.com/sirupsen/logrus"
- lSyslog "github.com/sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
- log := logrus.New()
- hook, err := lSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
-
- if err == nil {
- log.Hooks.Add(hook)
- }
-}
-```
diff --git a/vendor/github.com/sirupsen/logrus/hooks/syslog/syslog.go b/vendor/github.com/sirupsen/logrus/hooks/syslog/syslog.go
deleted file mode 100644
index 02b8df380..000000000
--- a/vendor/github.com/sirupsen/logrus/hooks/syslog/syslog.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// +build !windows,!nacl,!plan9
-
-package syslog
-
-import (
- "fmt"
- "log/syslog"
- "os"
-
- "github.com/sirupsen/logrus"
-)
-
-// SyslogHook to send logs via syslog.
-type SyslogHook struct {
- Writer *syslog.Writer
- SyslogNetwork string
- SyslogRaddr string
-}
-
-// Creates a hook to be added to an instance of logger. This is called with
-// `hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_DEBUG, "")`
-// `if err == nil { log.Hooks.Add(hook) }`
-func NewSyslogHook(network, raddr string, priority syslog.Priority, tag string) (*SyslogHook, error) {
- w, err := syslog.Dial(network, raddr, priority, tag)
- return &SyslogHook{w, network, raddr}, err
-}
-
-func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
- line, err := entry.String()
- if err != nil {
- fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
- return err
- }
-
- switch entry.Level {
- case logrus.PanicLevel:
- return hook.Writer.Crit(line)
- case logrus.FatalLevel:
- return hook.Writer.Crit(line)
- case logrus.ErrorLevel:
- return hook.Writer.Err(line)
- case logrus.WarnLevel:
- return hook.Writer.Warning(line)
- case logrus.InfoLevel:
- return hook.Writer.Info(line)
- case logrus.DebugLevel, logrus.TraceLevel:
- return hook.Writer.Debug(line)
- default:
- return nil
- }
-}
-
-func (hook *SyslogHook) Levels() []logrus.Level {
- return logrus.AllLevels
-}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index f1e143df8..6c794a1e3 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -31,6 +31,13 @@ codeberg.org/gruf/go-fastpath
# codeberg.org/gruf/go-hashenc v1.0.2
## explicit; go 1.16
codeberg.org/gruf/go-hashenc
+# codeberg.org/gruf/go-kv v1.3.2
+## explicit; go 1.16
+codeberg.org/gruf/go-kv
+codeberg.org/gruf/go-kv/format
+# codeberg.org/gruf/go-logger/v2 v2.0.6
+## explicit; go 1.16
+codeberg.org/gruf/go-logger/v2/level
# codeberg.org/gruf/go-mutexes v1.1.2
## explicit; go 1.14
codeberg.org/gruf/go-mutexes
@@ -309,7 +316,6 @@ github.com/russross/blackfriday/v2
# github.com/sirupsen/logrus v1.8.1
## explicit; go 1.13
github.com/sirupsen/logrus
-github.com/sirupsen/logrus/hooks/syslog
# github.com/spf13/afero v1.8.2
## explicit; go 1.13
github.com/spf13/afero