add config options for timeout + resolver address

This commit is contained in:
Roland Shoemaker 2015-05-28 11:39:32 +01:00
parent f2532c3a3f
commit ae1cf13be7
4 changed files with 18 additions and 0 deletions

View File

@ -33,6 +33,10 @@ func main() {
go cmd.ProfileCmd("VA", stats) go cmd.ProfileCmd("VA", stats)
vai := va.NewValidationAuthorityImpl(c.CA.TestMode) vai := va.NewValidationAuthorityImpl(c.CA.TestMode)
vai.DNSResolver = c.VA.DNSResolver
dnsTimeout, err := time.ParseDuration(c.VA.DNSTimeout)
cmd.FailOnError(err, "Couldn't parse DNS timeout")
vai.DNSTimeout = dnsTimeout
for { for {
ch := cmd.AmqpChannel(c.AMQP.Server) ch := cmd.AmqpChannel(c.AMQP.Server)

View File

@ -81,6 +81,10 @@ func main() {
ra := ra.NewRegistrationAuthorityImpl() ra := ra.NewRegistrationAuthorityImpl()
va := va.NewValidationAuthorityImpl(c.CA.TestMode) va := va.NewValidationAuthorityImpl(c.CA.TestMode)
va.DNSResolver = c.VA.DNSResolver
dnsTimeout, err := time.ParseDuration(c.VA.DNSTimeout)
cmd.FailOnError(err, "Couldn't parse DNS timeout")
va.DNSTimeout = dnsTimeout
cadb, err := ca.NewCertificateAuthorityDatabaseImpl(c.CA.DBDriver, c.CA.DBName) cadb, err := ca.NewCertificateAuthorityDatabaseImpl(c.CA.DBDriver, c.CA.DBName)
cmd.FailOnError(err, "Failed to create CA database") cmd.FailOnError(err, "Failed to create CA database")

View File

@ -69,6 +69,11 @@ type Config struct {
DBName string DBName string
} }
VA struct {
DNSResolver string
DNSTimeout string
}
SQL struct { SQL struct {
CreateTables bool CreateTables bool
SQLDebug bool SQLDebug bool

View File

@ -54,6 +54,11 @@
"dbName": ":memory:" "dbName": ":memory:"
}, },
"va": {
"dnsResolver": "8.8.8.8:53",
"dnsTimeout": "10s"
},
"sql": { "sql": {
"SQLDebug": true, "SQLDebug": true,
"CreateTables": false "CreateTables": false