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

Remove clientName everywhere. (#2862) 

This used to be used for AMQP queue names. Now that AMQP is gone, these consts
were only used when printing a version string at startup. This changes
VersionString to just use the name of the current program, and removes
`const clientName = ` from many of our main.go's.
This commit is contained in:
Jacob Hoffman-Andrews 2017-07-12 10:28:54 -07:00 committed by Roland Bracewell Shoemaker
parent 03dba10ca6
commit 63a25bf913
14 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/admin-revoker/main.go
View File

@ -27,8 +27,6 @@ import (
sapb "github.com/letsencrypt/boulder/sa/proto"
)
const clientName = "AdminRevoker"
const usageString = `
usage:
admin-revoker serial-revoke --config <path> <serial> <reason-code>

4
cmd/boulder-ca/main.go
View File

@ -26,8 +26,6 @@ import (
sapb "github.com/letsencrypt/boulder/sa/proto"
)
const clientName = "CA"
type config struct {
CA cmd.CAConfig
@ -139,7 +137,7 @@ func main() {
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString(clientName))
logger.Info(cmd.VersionString())
cmd.FailOnError(c.PA.CheckChallenges(), "Invalid PA configuration")

4
cmd/boulder-publisher/main.go
View File

@ -17,8 +17,6 @@ import (
sapb "github.com/letsencrypt/boulder/sa/proto"
)
const clientName = "Publisher"
type config struct {
Publisher struct {
cmd.ServiceConfig
@ -53,7 +51,7 @@ func main() {
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString(clientName))
logger.Info(cmd.VersionString())
logs := make([]*publisher.Log, len(c.Common.CT.Logs))
for i, ld := range c.Common.CT.Logs {

4
cmd/boulder-ra/main.go
View File

@ -25,8 +25,6 @@ import (
sapb "github.com/letsencrypt/boulder/sa/proto"
)
const clientName = "RA"
type config struct {
RA struct {
cmd.ServiceConfig
@ -105,7 +103,7 @@ func main() {
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString(clientName))
logger.Info(cmd.VersionString())
// Validate PA config and set defaults if needed
cmd.FailOnError(c.PA.CheckChallenges(), "Invalid PA configuration")

4
cmd/boulder-sa/main.go
View File

@ -15,8 +15,6 @@ import (
sapb "github.com/letsencrypt/boulder/sa/proto"
)
const clientName = "SA"
type config struct {
SA struct {
cmd.ServiceConfig
@ -45,7 +43,7 @@ func main() {
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString(clientName))
logger.Info(cmd.VersionString())
saConf := c.SA

4
cmd/boulder-va/main.go
View File

@ -15,8 +15,6 @@ import (
"github.com/letsencrypt/boulder/va"
)
const clientName = "VA"
type config struct {
VA struct {
cmd.ServiceConfig
@ -71,7 +69,7 @@ func main() {
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString(clientName))
logger.Info(cmd.VersionString())
pc := &cmd.PortConfig{
HTTPPort: 80,

4
cmd/boulder-wfe/main.go
View File

@ -22,8 +22,6 @@ import (
"github.com/letsencrypt/boulder/wfe"
)
const clientName = "WFE"
type config struct {
WFE struct {
cmd.ServiceConfig
@ -103,7 +101,7 @@ func main() {
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString(clientName))
logger.Info(cmd.VersionString())
kp, err := goodkey.NewKeyPolicy("") // don't load any weak keys
cmd.FailOnError(err, "Unable to create key policy")

4
cmd/boulder-wfe2/main.go
View File

@ -22,8 +22,6 @@ import (
"github.com/letsencrypt/boulder/wfe2"
)
const clientName = "WFE2"
type config struct {
WFE struct {
cmd.ServiceConfig
@ -103,7 +101,7 @@ func main() {
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString(clientName))
logger.Info(cmd.VersionString())
kp, err := goodkey.NewKeyPolicy("") // don't load any weak keys
cmd.FailOnError(err, "Unable to create key policy")

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

@ -356,8 +356,6 @@ func (ds durationSlice) Swap(a, b int) {
ds[a], ds[b] = ds[b], ds[a]
}
const clientName = "ExpirationMailer"
type config struct {
Mailer struct {
cmd.ServiceConfig
@ -409,7 +407,7 @@ func main() {
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString(clientName))
logger.Info(cmd.VersionString())
if *certLimit > 0 {
c.Mailer.CertLimit = *certLimit

4
cmd/expired-authz-purger/main.go
View File

@ -21,8 +21,6 @@ import (
"github.com/letsencrypt/boulder/sa"
)
const clientName = "ExpiredAuthzPurger"
type eapConfig struct {
ExpiredAuthzPurger struct {
cmd.DBConfig
@ -151,7 +149,7 @@ func main() {
// Set up logging
scope, auditlogger := cmd.StatsAndLogging(config.ExpiredAuthzPurger.Syslog)
auditlogger.Info(cmd.VersionString(clientName))
auditlogger.Info(cmd.VersionString())
defer auditlogger.AuditPanic()

2
cmd/ocsp-responder/main.go
View File

@ -173,7 +173,7 @@ as generated by Boulder's single-ocsp command.
scope, logger := cmd.StatsAndLogging(c.Syslog)
defer logger.AuditPanic()
logger.Info(cmd.VersionString("ocsp-responder"))
logger.Info(cmd.VersionString())
config := c.OCSPResponder
var source cfocsp.Source

4
cmd/ocsp-updater/main.go
View File

@ -707,8 +707,6 @@ func newLog(logConfig cmd.LogDescription) (*ctLog, error) {
return &ctLog{logID: logID, key: logConfig.Key, uri: logConfig.URI}, nil
}
const clientName = "OCSP"
type config struct {
OCSPUpdater cmd.OCSPUpdaterConfig
@ -771,7 +769,7 @@ func main() {
scope, auditlogger := cmd.StatsAndLogging(c.Syslog)
defer auditlogger.AuditPanic()
auditlogger.Info(cmd.VersionString(clientName))
auditlogger.Info(cmd.VersionString())
// Configure DB
dbURL, err := conf.DBConfig.URL()

5
cmd/shell.go
View File

@ -54,7 +54,7 @@ import (
func init() {
for _, v := range os.Args {
if v == "--version" || v == "-version" {
fmt.Println(VersionString(os.Args[0]))
fmt.Println(VersionString())
os.Exit(0)
}
}
@ -251,7 +251,8 @@ func ReadConfigFile(filename string, out interface{}) error {
}
// VersionString produces a friendly Application version string.
func VersionString(name string) string {
func VersionString() string {
name := path.Base(os.Args[0])
return fmt.Sprintf("Versions: %s=(%s %s) Golang=(%s) BuildHost=(%s)", name, core.GetBuildID(), core.GetBuildTime(), runtime.Version(), core.GetBuildHost())
}

4
cmd/shell_test.go
View File

@ -126,8 +126,8 @@ func TestVersionString(t *testing.T) {
core.BuildTime = "RightNow!"
core.BuildHost = "Localhost"
versionStr := VersionString("test")
expected := fmt.Sprintf("Versions: test=(TestBuildID RightNow!) Golang=(%s) BuildHost=(Localhost)", runtime.Version())
versionStr := VersionString()
expected := fmt.Sprintf("Versions: cmd.test=(TestBuildID RightNow!) Golang=(%s) BuildHost=(Localhost)", runtime.Version())
test.AssertEquals(t, versionStr, expected)
}