Commit 40aeea6a authored by matrushka's avatar matrushka

Added logging for ignored keyfiles in keystore.List and minor improvements.

License: MIT
Signed-off-by: default avatarmatrushka <barisgumustas@gmail.com>
parent 23e1179d
...@@ -7,9 +7,12 @@ import ( ...@@ -7,9 +7,12 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
) )
var log = logging.Logger("keystore")
// Keystore provides a key management interface // Keystore provides a key management interface
type Keystore interface { type Keystore interface {
// Has returns whether or not a key exist in the Keystore // Has returns whether or not a key exist in the Keystore
...@@ -158,14 +161,16 @@ func (ks *FSKeystore) List() ([]string, error) { ...@@ -158,14 +161,16 @@ func (ks *FSKeystore) List() ([]string, error) {
return nil, err return nil, err
} }
var list []string list := make([]string, 0)
for _, name := range dirs { for _, name := range dirs {
err := validateName(name) err := validateName(name)
if err == nil { if err == nil {
list = append(list, name) list = append(list, name)
} else {
log.Warningf("Ignoring the invalid keyfile: %s", name)
} }
} }
return list, err return list, nil
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment