Skip to content

Commit b71a850

Browse files
jshajsha
committed
Fix DBConfig references.
1 parent deb57e5 commit b71a850

File tree

11 files changed

+20
-19
lines changed

11 files changed

+20
-19
lines changed

‎cmd/admin-revoker/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func setupContext(context *cli.Context) (rpc.RegistrationAuthorityClient, *blog.
4848
rac, err := rpc.NewRegistrationAuthorityClient(clientName, amqpConf, stats)
4949
cmd.FailOnError(err, "Unable to create CA client")
5050

51-
dbURL, err := c.Revoker.DBConnect.URL()
51+
dbURL, err := c.Revoker.DBConfig.URL()
5252
cmd.FailOnError(err, "Couldn't load DB URL")
5353
dbMap, err := sa.NewDbMap(dbURL)
5454
cmd.FailOnError(err, "Couldn't setup database connection")

‎cmd/boulder-ca/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func main() {
3232

3333
go cmd.DebugServer(c.CA.DebugAddr)
3434

35-
dbURL, err := c.Revoker.DBConnect.URL()
35+
dbURL, err := c.PA.DBConfig.URL()
3636
cmd.FailOnError(err, "Couldn't load DB URL")
3737
paDbMap, err := sa.NewDbMap(dbURL)
3838
cmd.FailOnError(err, "Couldn't connect to policy database")

‎cmd/boulder-ra/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func main() {
3131

3232
go cmd.DebugServer(c.RA.DebugAddr)
3333

34-
dbURL, err := c.Revoker.DBConnect.URL()
34+
dbURL, err := c.PA.DBConfig.URL()
3535
cmd.FailOnError(err, "Couldn't load DB URL")
3636
paDbMap, err := sa.NewDbMap(dbURL)
3737
cmd.FailOnError(err, "Couldn't connect to policy database")

‎cmd/boulder-sa/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func main() {
2020
saConf := c.SA
2121
go cmd.DebugServer(saConf.DebugAddr)
2222

23-
dbURL, err := c.Revoker.DBConnect.URL()
23+
dbURL, err := c.SA.DBConfig.URL()
2424
cmd.FailOnError(err, "Couldn't load DB URL")
2525
dbMap, err := sa.NewDbMap(dbURL)
2626
cmd.FailOnError(err, "Couldn't connect to SA database")

‎cmd/cert-checker/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,14 @@ func main() {
239239
cmd.FailOnError(c.PA.CheckChallenges(), "Invalid PA configuration")
240240
c.PA.SetDefaultChallengesIfEmpty()
241241

242-
dbURL, err := c.CertChecker.DBConnect.URL()
242+
saDbURL, err := c.CertChecker.DBConfig.URL()
243243
cmd.FailOnError(err, "Couldn't load DB URL")
244-
saDbMap, err := sa.NewDbMap(dbURL)
244+
saDbMap, err := sa.NewDbMap(saDbURL)
245245
cmd.FailOnError(err, "Could not connect to database")
246246

247-
dbURL, err := c.PA.DBConnect.URL()
247+
paDbURL, err := c.PA.DBConfig.URL()
248248
cmd.FailOnError(err, "Couldn't load DB URL")
249-
saDbMap, err := sa.NewDbMap(dbURL)
249+
paDbMap, err := sa.NewDbMap(paDbURL)
250250
cmd.FailOnError(err, "Could not connect to policy database")
251251

252252
checker := newChecker(saDbMap, paDbMap, clock.Default(), c.PA.EnforcePolicyWhitelist, c.PA.Challenges)

‎cmd/config.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"errors"
1111
"fmt"
1212
"io/ioutil"
13-
"strings"
1413
"time"
1514

1615
cfsslConfig "github.com/letsencrypt/boulder/Godeps/_workspace/src/github.com/cloudflare/cfssl/config"
@@ -195,10 +194,11 @@ type DBConfig struct {
195194
// URL returns the DBConnect URL represented by this DBConfig object, either
196195
// loading it from disk or returning a default value.
197196
func (d *DBConfig) URL() (string, error) {
198-
if c.DBConnectFile != "" {
199-
return ioutil.ReadFile(c.DBConnectFile)
197+
if d.DBConnectFile != "" {
198+
url, err := ioutil.ReadFile(d.DBConnectFile)
199+
return string(url), err
200200
}
201-
return c.DBConnect, nil
201+
return d.DBConnect, nil
202202
}
203203

204204
// AMQPConfig describes how to connect to AMQP, and how to speak to each of the

‎cmd/expiration-mailer/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func main() {
231231
go cmd.DebugServer(c.Mailer.DebugAddr)
232232

233233
// Configure DB
234-
dbURL, err := c.Mailer.DBConnect.URL()
234+
dbURL, err := c.Mailer.DBConfig.URL()
235235
cmd.FailOnError(err, "Couldn't load DB URL")
236236
dbMap, err := sa.NewDbMap(dbURL)
237237
cmd.FailOnError(err, "Could not connect to database")

‎cmd/external-cert-importer/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func main() {
150150

151151
app.Action = func(c cmd.Config, stats statsd.Statter, auditlogger *blog.AuditLogger) {
152152
// Configure DB
153-
dbURL, err := c.PA.DBConnect.URL()
153+
dbURL, err := c.PA.DBConfig.URL()
154154
cmd.FailOnError(err, "Couldn't load DB URL")
155155
dbMap, err := sa.NewDbMap(dbURL)
156156
cmd.FailOnError(err, "Could not connect to database")

‎cmd/ocsp-responder/main.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,13 @@ func main() {
153153
var source cfocsp.Source
154154

155155
// DBConfig takes precedence over Source, if present.
156-
url, err := config.DBConfig.URL()
156+
dbConnect, err := config.DBConfig.URL()
157157
cmd.FailOnError(err, "Reading DB config")
158-
if url == "" {
159-
url, err = url.Parse(config.Source)
158+
if dbConnect == "" {
159+
dbConnect = config.Source
160160
cmd.FailOnError(err, fmt.Sprintf("Source was not a URL: %s", config.Source))
161161
}
162+
url, err := url.Parse(dbConnect)
162163

163164
if url.Scheme == "mysql+tcp" {
164165
auditlogger.Info(fmt.Sprintf("Loading OCSP Database for CA Cert: %s", c.Common.IssuerCert))

‎cmd/ocsp-updater/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ func main() {
560560
go cmd.ProfileCmd("OCSP-Updater", stats)
561561

562562
// Configure DB
563-
dbURL, err := c.Revoker.DBConnect.URL()
563+
dbURL, err := c.OCSPUpdater.DBConfig.URL()
564564
cmd.FailOnError(err, "Couldn't load DB URL")
565565
dbMap, err := sa.NewDbMap(dbURL)
566566
cmd.FailOnError(err, "Could not connect to database")

0 commit comments

Comments
 (0)