diff --git a/pkg/server/app/app.go b/pkg/server/app/app.go index 49fcfbc55..d2f8f8e19 100644 --- a/pkg/server/app/app.go +++ b/pkg/server/app/app.go @@ -179,7 +179,7 @@ func (a *Handler) Start() error { if e := os.Getenv("CAMLI_APP_BINDIR"); e != "" { binPath, err = exec.LookPath(filepath.Join(e, name)) if err != nil { - log.Printf("%q executable not found in %q", e) + log.Printf("%q executable not found in %q", name, e) } } if binPath == "" || err != nil { diff --git a/pkg/serverinit/devmode.go b/pkg/serverinit/devmode.go index e4a067bb8..2badfda65 100644 --- a/pkg/serverinit/devmode.go +++ b/pkg/serverinit/devmode.go @@ -61,7 +61,7 @@ func (hl *handlerLoader) initPublisherRootNode(ah *app.Handler) error { } camliRoot, ok := appConfig["camliRoot"].(string) if !ok { - return fmt.Errorf("camliRoot in publisher app handler appConfig is %T, want string, was %T", appConfig["camliRoot"]) + return fmt.Errorf("camliRoot in publisher app handler appConfig is %T, want string", appConfig["camliRoot"]) } result, err := camliRootQuery(camliRoot) if err == nil && len(result.Blobs) > 0 && result.Blobs[0].Blob.Valid() { diff --git a/server/camlistored/camlistored.go b/server/camlistored/camlistored.go index ca7704c05..14343d700 100644 --- a/server/camlistored/camlistored.go +++ b/server/camlistored/camlistored.go @@ -176,7 +176,7 @@ func genSelfTLS(listen string) error { keyOut, err := os.OpenFile(defKey, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600) if err != nil { - return fmt.Errorf("failed to open %s for writing:", defKey, err) + return fmt.Errorf("failed to open %s for writing: %s", defKey, err) } pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}) keyOut.Close()