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

Fix some errors, trivial problems.

Browse Source
This commit is contained in:
Naoki Kosaka
2021-06-19 07:30:32 +09:00
parent 0f59a6e5a1
commit 2ef9029bf0
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
models/config.go
View File

@ -6,6 +6,7 @@ import (
"fmt"
"net/url"
"os"
"strconv"
"github.com/RichardKnop/machinery/v1"
"github.com/RichardKnop/machinery/v1/config"
@ -36,13 +37,13 @@ func NewRelayConfig() (*RelayConfig, error) {
iconURL, err := url.ParseRequestURI(viper.GetString("RELAY_ICON"))
if err != nil {
fmt.Fprintln(os.Stderr, "RELAY_ICON IS INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
fmt.Fprintln(os.Stderr, "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 IS INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
fmt.Fprintln(os.Stderr, "RELAY_IMAGE: INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
imageURL = nil
}
@ -117,11 +118,12 @@ func (relayConfig *RelayConfig) RedisClient() *redis.Client {
func (relayConfig *RelayConfig) DumpWelcomeMessage(moduleName string, version string) string {
return fmt.Sprintf(`Welcome to YUKIMOCHI Activity-Relay %s - %s
- Configuration
RELAY NAME : %s
RELAY DOMAIN : %s
REDIS URL : %s
BIND ADDRESS : %s
`, version, moduleName, relayConfig.serviceName, relayConfig.domain.Host, relayConfig.redisURL, relayConfig.serverBind)
RELAY NAME : %s
RELAY DOMAIN : %s
REDIS URL : %s
BIND ADDRESS : %s
JOB_CONCURRENCY : %s
`, version, moduleName, relayConfig.serviceName, relayConfig.domain.Host, relayConfig.redisURL, relayConfig.serverBind, strconv.Itoa(relayConfig.jobConcurrency))
}
// NewMachineryServer create Redis backed Machinery Server from RelayConfig.

4
models/utils.go
View File

@ -4,6 +4,7 @@ import (
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"errors"
"fmt"
"io/ioutil"
"os"
@ -52,6 +53,9 @@ func readPrivateKeyRSA(keyPath string) (*rsa.PrivateKey, error) {
return nil, err
}
decoded, _ := pem.Decode(file)
if decoded == nil {
return nil, errors.New("ACTOR_PEM IS INVALID. FAILED TO READ")
}
privateKey, err := x509.ParsePKCS1PrivateKey(decoded.Bytes)
if err != nil {
return nil, err