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

Words typo in codes fixed.

Browse Source
This commit is contained in:
Naoki Kosaka
2021-06-20 17:26:15 +09:00
parent 4dd69d0dac
commit f05921420f
20 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deliver/deriver.go
View File

@ -32,13 +32,13 @@ func relayActivity(args ...string) error {
err := sendActivity(inboxURL, Actor.ID, []byte(body), globalConfig.ActorKey())
if err != nil {
domain, _ := url.Parse(inboxURL)
eval_script := "local change = redis.call('HSETNX',KEYS[1], 'last_error', ARGV[1]); if change == 1 then redis.call('EXPIRE', KEYS[1], ARGV[2]) end;"
redisClient.Eval(eval_script, []string{"relay:statistics:" + domain.Host}, err.Error(), 60).Result()
evalScript := "local change = redis.call('HSETNX',KEYS[1], 'last_error', ARGV[1]); if change == 1 then redis.call('EXPIRE', KEYS[1], ARGV[2]) end;"
redisClient.Eval(evalScript, []string{"relay:statistics:" + domain.Host}, err.Error(), 60).Result()
}
return err
}
func registorActivity(args ...string) error {
func registerActivity(args ...string) error {
inboxURL := args[0]
body := args[1]
err := sendActivity(inboxURL, Actor.ID, []byte(body), globalConfig.ActorKey())
@ -55,7 +55,7 @@ func Entrypoint(g *models.RelayConfig, v string) error {
return err
}
err = machineryServer.RegisterTask("registor", registorActivity)
err = machineryServer.RegisterTask("register", registerActivity)
if err != nil {
return err
}

16
deliver/deriver_test.go
View File

@ -56,7 +56,7 @@ func TestRelayActivity(t *testing.T) {
err := relayActivity(s.URL, "data")
if err != nil {
t.Fatal("Failed - Data transfar not collect")
t.Fatal("Failed - Data transfer not collect")
}
}
@ -95,7 +95,7 @@ func TestRelayActivityResp500(t *testing.T) {
}
}
func TestRegistorActivity(t *testing.T) {
func TestRegisterActivity(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
data, _ := ioutil.ReadAll(r.Body)
if string(data) != "data" || r.Header.Get("Content-Type") != "application/activity+json" {
@ -108,32 +108,32 @@ func TestRegistorActivity(t *testing.T) {
}))
defer s.Close()
err := registorActivity(s.URL, "data")
err := registerActivity(s.URL, "data")
if err != nil {
t.Fatal("Failed - Data transfar not collect")
t.Fatal("Failed - Data transfer not collect")
}
}
func TestRegistorActivityNoHost(t *testing.T) {
func TestRegisterActivityNoHost(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
}))
defer s.Close()
err := registorActivity("http://nohost.example.jp", "data")
err := registerActivity("http://nohost.example.jp", "data")
if err == nil {
t.Fatal("Failed - Error not reported.")
}
}
func TestRegistorActivityResp500(t *testing.T) {
func TestRegisterActivityResp500(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(500)
w.Write(nil)
}))
defer s.Close()
err := registorActivity(s.URL, "data")
err := registerActivity(s.URL, "data")
if err == nil {
t.Fatal("Failed - Error not reported.")
}

2
deliver/logger.go
View File

@ -4,7 +4,7 @@ package deliver
type NullLogger struct {
}
// NewNullLogger : Create Nulllogger
// NewNullLogger : Create NullLogger
func NewNullLogger() *NullLogger {
var newNullLogger NullLogger
return &newNullLogger

2
deliver/sender.go
View File

@ -35,7 +35,7 @@ func appendSignature(request *http.Request, body *[]byte, KeyID string, publicKe
func sendActivity(inboxURL string, KeyID string, body []byte, publicKey *rsa.PrivateKey) error {
req, _ := http.NewRequest("POST", inboxURL, bytes.NewBuffer(body))
req.Header.Set("Content-Type", "application/activity+json")
req.Header.Set("User-Agent", fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", globalConfig.ServerServicename(), version, globalConfig.ServerHostname().Host))
req.Header.Set("User-Agent", fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", globalConfig.ServerServiceName(), version, globalConfig.ServerHostname().Host))
req.Header.Set("Date", httpdate.Time2Str(time.Now()))
appendSignature(req, &body, KeyID, publicKey)
resp, err := httpClient.Do(req)