letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Mailer's AMQP config instead of SA. 

Mailer was erroneously using SA's AMQP config.
This commit is contained in:
Jacob Hoffman-Andrews 2015-11-30 14:58:34 -08:00
parent 7f6cb6ac15
commit d5879fa9ee
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/expiration-mailer/main.go
View File

@ -234,7 +234,7 @@ func main() {
dbMap, err := sa.NewDbMap(c.Mailer.DBConnect) dbMap, err := sa.NewDbMap(c.Mailer.DBConnect)
cmd.FailOnError(err, "Could not connect to database") cmd.FailOnError(err, "Could not connect to database")
amqpConf := c.SA.AMQP amqpConf := c.Mailer.AMQP
sac, err := rpc.NewStorageAuthorityClient(clientName, amqpConf, stats) sac, err := rpc.NewStorageAuthorityClient(clientName, amqpConf, stats)
cmd.FailOnError(err, "Failed to create SA client") cmd.FailOnError(err, "Failed to create SA client")

10
test/boulder-config.json
View File

@ -259,7 +259,15 @@
"nagTimes": ["24h", "72h", "168h", "336h"], "nagTimes": ["24h", "72h", "168h", "336h"],
"nagCheckInterval": "24h", "nagCheckInterval": "24h",
"emailTemplate": "test/example-expiration-template", "emailTemplate": "test/example-expiration-template",
"debugAddr": "localhost:8008" "debugAddr": "localhost:8008",
"amqp": {
"serverURLFile": "test/secrets/amqp_url",
"insecure": true,
"SA": {
"server": "SA.server",
"rpcTimeout": "15s"
}
}
}, },
"publisher": { "publisher": {