lilfade/Activity-Relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Use logrus.

Browse Source
This commit is contained in:
Naoki Kosaka
2021-09-14 21:22:38 +09:00
parent 56bf2f093e
commit 7c33331c40
13 changed files with 115 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
control/config.go
View File

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

7
control/control.go
View File

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

4
control/follow.go
View File

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