[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>

1 files changed, 10 insertions, 11 deletions

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
 }