Use logrus.

2021-09-14 21:22:38 +09:00 · 2021-09-14 21:22:38 +09:00 · 7c33331c40
commit 7c33331c40
parent 56bf2f093e
13 changed files with 115 additions and 48 deletions
--- a/api/api.go
+++ b/api/api.go
@ -1,12 +1,12 @@
 package api

 import (
-	"fmt"
 	"net/http"
 	"time"

 	"github.com/RichardKnop/machinery/v1"
 	cache "github.com/patrickmn/go-cache"
+	"github.com/sirupsen/logrus"
 	"github.com/yukimochi/Activity-Relay/models"
 )

@ -40,7 +40,7 @@ func Entrypoint(g *models.RelayConfig, v string) error {

 	registResourceHandlers()

-	fmt.Println("Staring API Server at", globalConfig.ServerBind())
+	logrus.Info("Staring API Server at ", globalConfig.ServerBind())
 	err = http.ListenAndServe(globalConfig.ServerBind(), nil)
 	if err != nil {
 		return err
--- a/api/handle.go
+++ b/api/handle.go
@ -3,12 +3,11 @@ package api
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"net/http"
 	"net/url"
-	"os"

 	"github.com/RichardKnop/machinery/v1/tasks"
+	"github.com/sirupsen/logrus"
 	"github.com/yukimochi/Activity-Relay/models"
 )

@ -126,7 +125,7 @@ func pushRelayJob(sourceInbox string, body []byte) {
 			}
 			_, err := machineryServer.SendTask(job)
 			if err != nil {
-				fmt.Fprintln(os.Stderr, err)
+				logrus.Error(err)
 			}
 		}
 	}
@ -151,7 +150,7 @@ func pushRegisterJob(inboxURL string, body []byte) {
 	}
 	_, err := machineryServer.SendTask(job)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		logrus.Error(err)
 	}
 }

@ -217,7 +216,7 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
 					resp := activity.GenerateResponse(globalConfig.ServerHostname(), "Reject")
 					jsonData, _ := json.Marshal(&resp)
 					go pushRegisterJob(actor.Inbox, jsonData)
-					fmt.Println("Reject Follow Request : ", err.Error(), activity.Actor)
+					logrus.Error("Reject Follow Request : ", err.Error(), activity.Actor)

 					writer.WriteHeader(202)
 					writer.Write(nil)
@ -231,7 +230,7 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
 								"actor":       actor.ID,
 								"object":      activity.Object.(string),
 							})
-							fmt.Println("Pending Follow Request : ", activity.Actor)
+							logrus.Info("Pending Follow Request : ", activity.Actor)
 						} else {
 							resp := activity.GenerateResponse(globalConfig.ServerHostname(), "Accept")
 							jsonData, _ := json.Marshal(&resp)
@ -242,13 +241,13 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
 								ActivityID: activity.ID,
 								ActorID:    actor.ID,
 							})
-							fmt.Println("Accept Follow Request : ", activity.Actor)
+							logrus.Info("Accept Follow Request : ", activity.Actor)
 						}
 					} else {
 						resp := activity.GenerateResponse(globalConfig.ServerHostname(), "Reject")
 						jsonData, _ := json.Marshal(&resp)
 						go pushRegisterJob(actor.Inbox, jsonData)
-						fmt.Println("Reject Follow Request : ", activity.Actor)
+						logrus.Info("Reject Follow Request : ", activity.Actor)
 					}

 					writer.WriteHeader(202)
@ -259,12 +258,12 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
 				if nestedActivity.Type == "Follow" && nestedActivity.Actor == activity.Actor {
 					err = unFollowAcceptable(nestedActivity, actor)
 					if err != nil {
-						fmt.Println("Reject Unfollow Request : ", err.Error())
+						logrus.Error("Reject Unfollow Request : ", err.Error())
 						writer.WriteHeader(400)
 						writer.Write([]byte(err.Error()))
 					} else {
 						relayState.DelSubscription(domain.Host)
-						fmt.Println("Accept Unfollow Request : ", activity.Actor)
+						logrus.Info("Accept Unfollow Request : ", activity.Actor)

 						writer.WriteHeader(202)
 						writer.Write(nil)
@ -277,7 +276,7 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
 					} else {
 						domain, _ := url.Parse(activity.Actor)
 						go pushRelayJob(domain.Host, body)
-						fmt.Println("Accept Relay Status : ", activity.Actor)
+						logrus.Debug("Accept Relay Status : ", activity.Actor)

 						writer.WriteHeader(202)
 						writer.Write(nil)
@ -293,23 +292,23 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
 						if relayState.RelayConfig.CreateAsAnnounce && activity.Type == "Create" {
 							nestedObject, err := activity.NestedActivity()
 							if err != nil {
-								fmt.Println("Fail Assert activity : activity.Actor")
+								logrus.Error("Fail Decode Activity : ", err.Error())
 							}
 							switch nestedObject.Type {
 							case "Note":
 								resp := nestedObject.GenerateAnnounce(globalConfig.ServerHostname())
 								jsonData, _ := json.Marshal(&resp)
 								go pushRelayJob(domain.Host, jsonData)
-								fmt.Println("Accept Announce Note : ", activity.Actor)
+								logrus.Debug("Accept Announce Note : ", activity.Actor)
 							default:
-								fmt.Println("Skipping Announce", nestedObject.Type, ": ", activity.Actor)
+								logrus.Debug("Skipping Announce", nestedObject.Type, ": ", activity.Actor)
 							}
 						} else {
 							go pushRelayJob(domain.Host, body)
-							fmt.Println("Accept Relay Status : ", activity.Actor)
+							logrus.Debug("Accept Relay Status : ", activity.Actor)
 						}
 					} else {
-						fmt.Println("Skipping Relay Status : ", activity.Actor)
+						logrus.Debug("Skipping Relay Status : ", activity.Actor)
 					}

 					writer.WriteHeader(202)
--- a/control/config.go
+++ b/control/config.go
@ -2,10 +2,10 @@ package control

 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"os"

+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/yukimochi/Activity-Relay/models"
 )
@ -126,18 +126,18 @@ func exportConfig(cmd *cobra.Command, args []string) {
 func importConfig(cmd *cobra.Command, args []string) {
 	file, err := os.Open(cmd.Flag("json").Value.String())
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		logrus.Error(err)
 		return
 	}
 	jsonData, err := ioutil.ReadAll(file)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		logrus.Error(err)
 		return
 	}
 	var data models.RelayState
 	err = json.Unmarshal(jsonData, &data)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		logrus.Error(err)
 		return
 	}

--- a/control/control.go
+++ b/control/control.go
@ -1,10 +1,10 @@
 package control

 import (
-	"fmt"
 	"os"

 	"github.com/RichardKnop/machinery/v1"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/yukimochi/Activity-Relay/models"
@ -50,7 +50,7 @@ func initConfig(cmd *cobra.Command) error {
 		viper.SetConfigType("yaml")
 		viper.ReadConfig(file)
 	} else {
-		fmt.Fprintln(os.Stderr, "Config file not exist. Use environment variables.")
+		logrus.Warn("Config file not exist. Use environment variables.")

 		viper.BindEnv("ACTOR_PEM")
 		viper.BindEnv("REDIS_URL")
@ -65,8 +65,7 @@ func initConfig(cmd *cobra.Command) error {

 	globalConfig, err = models.NewRelayConfig()
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
+		logrus.Fatal(err)
 	}

 	initialize(globalConfig)
--- a/control/follow.go
+++ b/control/follow.go
@ -3,11 +3,11 @@ package control
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 	"strings"

 	"github.com/RichardKnop/machinery/v1/tasks"
 	uuid "github.com/satori/go.uuid"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/yukimochi/Activity-Relay/models"
 )
@ -83,7 +83,7 @@ func pushRegisterJob(inboxURL string, body []byte) {
 	}
 	_, err := machineryServer.SendTask(job)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		logrus.Error(err)
 	}
 }

--- a/deliver/deriver.go
+++ b/deliver/deriver.go
@ -1,16 +1,15 @@
 package deliver

 import (
-	"fmt"
 	"net/http"
 	"net/url"
-	"os"
 	"time"

 	"github.com/RichardKnop/machinery/v1"
 	"github.com/RichardKnop/machinery/v1/log"
 	"github.com/go-redis/redis"
 	uuid "github.com/satori/go.uuid"
+	"github.com/sirupsen/logrus"
 	"github.com/yukimochi/Activity-Relay/models"
 )

@ -68,7 +67,7 @@ func Entrypoint(g *models.RelayConfig, v string) error {
 	worker := machineryServer.NewWorker(workerID.String(), globalConfig.JobConcurrency())
 	err = worker.Launch()
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		logrus.Error(err)
 	}

 	return nil
--- a/deliver/sender.go
+++ b/deliver/sender.go
@ -11,6 +11,7 @@ import (
 	"time"

 	httpdate "github.com/Songmu/go-httpdate"
+	"github.com/sirupsen/logrus"
 	"github.com/yukimochi/httpsig"
 )

@ -44,7 +45,7 @@ func sendActivity(inboxURL string, KeyID string, body []byte, publicKey *rsa.Pri
 	}
 	defer resp.Body.Close()

-	fmt.Println(inboxURL, resp.StatusCode)
+	logrus.Debug(inboxURL, resp.StatusCode)
 	if resp.StatusCode/100 != 2 {
 		return errors.New("Post " + inboxURL + ": " + resp.Status)
 	}
--- a/go.mod
+++ b/go.mod
@ -1,6 +1,6 @@
 module github.com/yukimochi/Activity-Relay

-go 1.16
+go 1.17

 require (
 	github.com/RichardKnop/machinery v1.10.6
@ -8,7 +8,73 @@ require (
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/satori/go.uuid v1.2.0
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/viper v1.7.1
 	github.com/yukimochi/httpsig v0.1.3
 )
+
+require (
+	cloud.google.com/go v0.76.0 // indirect
+	cloud.google.com/go/pubsub v1.10.0 // indirect
+	github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae // indirect
+	github.com/aws/aws-sdk-go v1.37.16 // indirect
+	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-redis/redis/v8 v8.6.0 // indirect
+	github.com/go-redsync/redsync/v4 v4.0.4 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/golang/snappy v0.0.2 // indirect
+	github.com/gomodule/redigo v2.0.0+incompatible // indirect
+	github.com/google/go-cmp v0.5.4 // indirect
+	github.com/google/uuid v1.2.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
+	github.com/kelseyhightower/envconfig v1.4.0 // indirect
+	github.com/klauspost/compress v1.11.7 // indirect
+	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pelletier/go-toml v1.7.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
+	github.com/spf13/afero v1.1.2 // indirect
+	github.com/spf13/cast v1.3.0 // indirect
+	github.com/spf13/jwalterweatherman v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/streadway/amqp v1.0.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
+	github.com/xdg/stringprep v1.0.0 // indirect
+	go.mongodb.org/mongo-driver v1.4.6 // indirect
+	go.opencensus.io v0.22.6 // indirect
+	go.opentelemetry.io/otel v0.17.0 // indirect
+	go.opentelemetry.io/otel/metric v0.17.0 // indirect
+	go.opentelemetry.io/otel/trace v0.17.0 // indirect
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
+	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
+	golang.org/x/mod v0.4.1 // indirect
+	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
+	golang.org/x/oauth2 v0.0.0-20210201163806-010130855d6c // indirect
+	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
+	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
+	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/tools v0.1.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/api v0.39.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea // indirect
+	google.golang.org/grpc v1.35.0 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/ini.v1 v1.51.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)
--- a/go.sum
+++ b/go.sum
@ -356,6 +356,8 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
--- a/main.go
+++ b/main.go
@ -43,6 +43,7 @@ import (
 	"fmt"
 	"os"

+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/yukimochi/Activity-Relay/api"
@ -58,6 +59,10 @@ var (
 )

 func main() {
+	logrus.SetFormatter(&logrus.TextFormatter{
+		ForceColors: true,
+	})
+
 	var app = buildCommand()
 	app.PersistentFlags().StringP("config", "c", "config.yml", "Path of config file.")

@ -74,8 +79,7 @@ func buildCommand() *cobra.Command {
 			fmt.Println(globalConfig.DumpWelcomeMessage("API Server", version))
 			err := api.Entrypoint(globalConfig, version)
 			if err != nil {
-				fmt.Fprintln(os.Stderr, err.Error())
-				os.Exit(1)
+				logrus.Fatal(err.Error())
 			}
 			return nil
 		},
@ -90,8 +94,7 @@ func buildCommand() *cobra.Command {
 			fmt.Println(globalConfig.DumpWelcomeMessage("Job Worker", version))
 			err := deliver.Entrypoint(globalConfig, version)
 			if err != nil {
-				fmt.Println(err.Error())
-				os.Exit(1)
+				logrus.Fatal(err.Error())
 			}
 			return nil
 		},
@ -124,7 +127,7 @@ func initConfig(cmd *cobra.Command) {
 		viper.SetConfigType("yaml")
 		viper.ReadConfig(file)
 	} else {
-		fmt.Fprintln(os.Stderr, "Config file not exist. Use environment variables.")
+		logrus.Error("Config file not exist. Use environment variables.")

 		viper.BindEnv("ACTOR_PEM")
 		viper.BindEnv("REDIS_URL")
@ -139,7 +142,6 @@ func initConfig(cmd *cobra.Command) {

 	globalConfig, err = models.NewRelayConfig()
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
+		logrus.Fatal(err.Error())
 	}
 }
--- a/models/config.go
+++ b/models/config.go
@ -5,12 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"os"
 	"strconv"

 	"github.com/RichardKnop/machinery/v1"
 	"github.com/RichardKnop/machinery/v1/config"
 	"github.com/go-redis/redis"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )

@ -37,13 +37,13 @@ func NewRelayConfig() (*RelayConfig, error) {

 	iconURL, err := url.ParseRequestURI(viper.GetString("RELAY_ICON"))
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "RELAY_ICON: INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
+		logrus.Warn("RELAY_ICON: INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
 		iconURL = nil
 	}

 	imageURL, err := url.ParseRequestURI(viper.GetString("RELAY_IMAGE"))
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "RELAY_IMAGE: INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
+		logrus.Warn("RELAY_IMAGE: INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
 		imageURL = nil
 	}

--- a/models/state.go
+++ b/models/state.go
@ -1,10 +1,10 @@
 package models

 import (
-	"fmt"
 	"strings"

 	"github.com/go-redis/redis"
+	"github.com/sirupsen/logrus"
 )

 // Config : Enum for RelayConfig
@ -50,7 +50,7 @@ func (config *RelayState) ListenNotify(c chan<- bool) {
 	cNotify := c != nil
 	go func() {
 		for range ch {
-			fmt.Println("Config refreshed from state changed notify.")
+			logrus.Info("Config refreshed from state changed notify.")
 			config.Load()
 			if cNotify {
 				c <- true
--- a/models/utils.go
+++ b/models/utils.go
@ -5,11 +5,10 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"errors"
-	"fmt"
 	"io/ioutil"
-	"os"

 	"github.com/go-redis/redis"
+	"github.com/sirupsen/logrus"
 )

 func ReadPublicKeyRSAFromString(pemString string) (*rsa.PublicKey, error) {
@ -20,7 +19,7 @@ func ReadPublicKeyRSAFromString(pemString string) (*rsa.PublicKey, error) {
 	}()
 	keyInterface, err := x509.ParsePKIXPublicKey(decoded.Bytes)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		logrus.Error(err)
 		return nil, err
 	}
 	pub := keyInterface.(*rsa.PublicKey)