docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-10-31 10:34:26 +03:00
Code Activity

Use logrus instead of fmt.Println

Browse Source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan
2015-07-10 17:10:23 -07:00
parent cab1006568
commit f292b562e2
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/changelist/changelist.go
View File

@@ -3,8 +3,9 @@ package changelist
import (
"bufio"
"encoding/json"
"fmt"
"os"
"github.com/Sirupsen/logrus"
)
// AppendChangelist represents a list of TUF changes
@@ -38,7 +39,7 @@ func (cl *AppendChangelist) List() []Change {
err := json.Unmarshal(line, c)
if err != nil {
// TODO(david): How should we handle this?
fmt.Println(err.Error())
logrus.Warn(err.Error())
continue
}
changes = append(changes, c)

4
client/changelist/files_changelist.go
View File

@@ -48,14 +48,14 @@ func (cl FileChangelist) List() []Change {
raw, err := ioutil.ReadFile(path.Join(cl.dir, f.Name()))
if err != nil {
// TODO(david): How should we handle this?
fmt.Println(err.Error())
logrus.Warn(err.Error())
continue
}
c := &TufChange{}
err = json.Unmarshal(raw, c)
if err != nil {
// TODO(david): How should we handle this?
fmt.Println(err.Error())
logrus.Warn(err.Error())
continue
}
changes = append(changes, c)

7
client/client.go
View File

@@ -111,7 +111,7 @@ func NewNotaryRepository(baseDir, gun, baseURL string, rt http.RoundTripper) (*N
return nil, err
}
fmt.Println("creating non-root cryptoservice")
logrus.Debugf("creating non-root cryptoservice")
signer := signed.NewSigner(NewCryptoService(gun, privKeyStore))
nRepo := &NotaryRepository{
@@ -430,7 +430,7 @@ func (r *NotaryRepository) bootstrapRepo() error {
kdb := keys.NewDB()
tufRepo := tuf.NewTufRepo(kdb, r.signer)
fmt.Println("Loading trusted collection.")
logrus.Debugf("Loading trusted collection.")
rootJSON, err := fileStore.GetMeta("root", 0)
if err != nil {
return err
@@ -479,7 +479,7 @@ func (r *NotaryRepository) saveMetadata(rootSigner *signed.Signer) error {
}
func (r *NotaryRepository) snapshot() error {
fmt.Println("Saving changes to Trusted Collection.")
logrus.Debugf("Saving changes to Trusted Collection.")
for t := range r.tufRepo.Targets {
signedTargets, err := r.tufRepo.SignTargets(t, data.DefaultExpires("targets"), nil)
@@ -641,7 +641,6 @@ func (r *NotaryRepository) GetRootSigner(rootKeyID, passphrase string) (*Unlocke
// when a root key is needed.
// Passing an empty GUN because root keys aren't associated with a GUN.
fmt.Println("creating root cryptoservice with passphrase", passphrase)
ccs := NewCryptoService("", r.rootKeyStore)
ccs.SetPassphrase(passphrase)
signer := signed.NewSigner(ccs)