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

Use RedisUrl correctly. (#17)

Browse Source
This commit is contained in:
Naoki Kosaka
2019-03-16 14:36:03 +09:00
committed by GitHub
parent 553866cac0
commit 376ae5a099
9 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
worker/worker.go
View File

@ -54,16 +54,21 @@ func initConfig() {
viper.BindEnv("redis_url")
hostURL, _ = url.Parse("https://" + viper.GetString("relay_domain"))
hostPrivatekey, _ = keyloader.ReadPrivateKeyRSAfromPath(viper.GetString("actor_pem"))
redisClient = redis.NewClient(&redis.Options{
Addr: viper.GetString("redis_url"),
})
redisOption, err := redis.ParseURL(viper.GetString("redis_url"))
if err != nil {
panic(err)
}
redisClient = redis.NewClient(redisOption)
machineryConfig := &config.Config{
Broker: "redis://" + viper.GetString("redis_url"),
Broker: viper.GetString("redis_url"),
DefaultQueue: "relay",
ResultBackend: "redis://" + viper.GetString("redis_url"),
ResultBackend: viper.GetString("redis_url"),
ResultsExpireIn: 5,
}
machineryServer, _ = machinery.NewServer(machineryConfig)
machineryServer, err = machinery.NewServer(machineryConfig)
if err != nil {
panic(err)
}
newNullLogger := NewNullLogger()
log.DEBUG = newNullLogger
uaString = viper.GetString("relay_servicename") + " (golang net/http; Activity-Relay v0.2.2; " + hostURL.Host + ")"

4
worker/worker_test.go
View File

@ -12,8 +12,8 @@ import (
)
func TestMain(m *testing.M) {
viper.Set("Actor_pem", "../misc/testKey.pem")
viper.Set("Relay_domain", "relay.yukimochi.example.org")
viper.Set("actor_pem", "../misc/testKey.pem")
viper.Set("relay_domain", "relay.yukimochi.example.org")
initConfig()
redisClient.FlushAll().Result()