[chore] use our own logging implementation (#716)

* first commit

Signed-off-by: kim <grufwub@gmail.com>

* replace logging with our own log library

Signed-off-by: kim <grufwub@gmail.com>

* fix imports

Signed-off-by: kim <grufwub@gmail.com>

* fix log imports

Signed-off-by: kim <grufwub@gmail.com>

* add license text

Signed-off-by: kim <grufwub@gmail.com>

* fix package import cycle between config and log package

Signed-off-by: kim <grufwub@gmail.com>

* fix empty kv.Fields{} being passed to WithFields()

Signed-off-by: kim <grufwub@gmail.com>

* fix uses of log.WithFields() with whitespace issues and empty slices

Signed-off-by: kim <grufwub@gmail.com>

* *linter related grumbling*

Signed-off-by: kim <grufwub@gmail.com>

* gofmt the codebase! also fix more log.WithFields() formatting issues

Signed-off-by: kim <grufwub@gmail.com>

* update testrig code to match new changes

Signed-off-by: kim <grufwub@gmail.com>

* fix error wrapping in non fmt.Errorf function

Signed-off-by: kim <grufwub@gmail.com>

* add benchmarking of log.Caller() vs non-cached

Signed-off-by: kim <grufwub@gmail.com>

* fix syslog tests, add standard build tags to test runner to ensure consistency

Signed-off-by: kim <grufwub@gmail.com>

* make syslog tests more robust

Signed-off-by: kim <grufwub@gmail.com>

* fix caller depth arithmatic (is that how you spell it?)

Signed-off-by: kim <grufwub@gmail.com>

* update to use unkeyed fields in kv.Field{} instances

Signed-off-by: kim <grufwub@gmail.com>

* update go-kv library

Signed-off-by: kim <grufwub@gmail.com>

* update libraries list

Signed-off-by: kim <grufwub@gmail.com>

* fuck you linter get nerfed

Signed-off-by: kim <grufwub@gmail.com>

Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>

3 files changed, 9 insertions, 13 deletions

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)
 				}
 			}
 		}