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

Update build step.

Browse Source
This commit is contained in:
Naoki Kosaka
2019-06-02 21:08:40 +09:00
parent 99c2525419
commit 6ca6c9aad0
7 changed files with 78 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
cli/cli.go
View File

@ -15,13 +15,17 @@ import (
state "github.com/yukimochi/Activity-Relay/State"
)
// Actor : Relay's Actor
var Actor activitypub.Actor
var (
version string
var hostname *url.URL
var hostkey *rsa.PrivateKey
var macServer *machinery.Server
var relayState state.RelayState
// Actor : Relay's Actor
Actor activitypub.Actor
hostname *url.URL
hostkey *rsa.PrivateKey
relayState state.RelayState
machineryServer *machinery.Server
)
func initConfig() {
viper.SetConfigName("config")
@ -30,41 +34,42 @@ func initConfig() {
if err != nil {
fmt.Println("Config file is not exists. Use environment variables.")
viper.BindEnv("actor_pem")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_servicename")
viper.BindEnv("redis_url")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_servicename")
} else {
Actor.Summary = viper.GetString("relay_summary")
Actor.Icon = activitypub.Image{viper.GetString("relay_icon")}
Actor.Image = activitypub.Image{viper.GetString("relay_image")}
Actor.Icon = activitypub.Image{URL: viper.GetString("relay_icon")}
Actor.Image = activitypub.Image{URL: viper.GetString("relay_image")}
}
Actor.Name = viper.GetString("relay_servicename")
hostkey, err := keyloader.ReadPrivateKeyRSAfromPath(viper.GetString("actor_pem"))
if err != nil {
panic(err)
}
hostname, err = url.Parse("https://" + viper.GetString("relay_domain"))
if err != nil {
panic(err)
}
redOption, err := redis.ParseURL(viper.GetString("redis_url"))
hostkey, err := keyloader.ReadPrivateKeyRSAfromPath(viper.GetString("actor_pem"))
if err != nil {
panic(err)
}
redClient := redis.NewClient(redOption)
var macConfig = &config.Config{
redisOption, err := redis.ParseURL(viper.GetString("redis_url"))
if err != nil {
panic(err)
}
redisClient := redis.NewClient(redisOption)
relayState = state.NewState(redisClient)
var machineryConfig = &config.Config{
Broker: viper.GetString("redis_url"),
DefaultQueue: "relay",
ResultBackend: viper.GetString("redis_url"),
ResultsExpireIn: 5,
}
macServer, err = machinery.NewServer(macConfig)
machineryServer, err = machinery.NewServer(machineryConfig)
if err != nil {
panic(err)
}
relayState = state.NewState(redClient)
Actor.GenerateSelfKey(hostname, &hostkey.PublicKey)
}

2
cli/follow.go
View File

@ -74,7 +74,7 @@ func pushRegistorJob(inboxURL string, body []byte) {
},
},
}
_, err := macServer.SendTask(job)
_, err := machineryServer.SendTask(job)
if err != nil {
fmt.Fprintln(os.Stderr, err)
}