From 697d7ec73d553e8525ba56d81a04d843ce18f1a1 Mon Sep 17 00:00:00 2001
From: Chris Jones <christian.jones@sri.com>
Date: Tue, 7 Feb 2017 15:25:27 -0700
Subject: [PATCH] storage: report errors in GroupList

Errors should be reported instead of silently failing to read files.
---
 cmd/matchbox/main.go          |  3 ++-
 matchbox/storage/filestore.go | 14 +++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/cmd/matchbox/main.go b/cmd/matchbox/main.go
index fa19cfda..ecac9c95 100644
--- a/cmd/matchbox/main.go
+++ b/cmd/matchbox/main.go
@@ -122,7 +122,8 @@ func main() {
 
 	// storage
 	store := storage.NewFileStore(&storage.Config{
-		Root: flags.dataPath,
+		Root:   flags.dataPath,
+		Logger: log,
 	})
 
 	// core logic
diff --git a/matchbox/storage/filestore.go b/matchbox/storage/filestore.go
index b083c7d2..6e9e5ce0 100644
--- a/matchbox/storage/filestore.go
+++ b/matchbox/storage/filestore.go
@@ -5,24 +5,28 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/coreos/matchbox/matchbox/storage/storagepb"
 )
 
 // Config initializes a fileStore.
 type Config struct {
-	Root string
+	Root   string
+	Logger *logrus.Logger
 }
 
 // fileStore implements ths Store interface. Queries to the file system
 // are restricted to the specified directory tree.
 type fileStore struct {
-	root string
+	root   string
+	logger *logrus.Logger
 }
 
 // NewFileStore returns a new memory-backed Store.
 func NewFileStore(config *Config) Store {
 	return &fileStore{
-		root: config.Root,
+		root:   config.Root,
+		logger: config.Logger,
 	}
 }
 
@@ -64,6 +68,8 @@ func (s *fileStore) GroupList() ([]*storagepb.Group, error) {
 		group, err := s.GroupGet(name)
 		if err == nil {
 			groups = append(groups, group)
+		} else if s.logger != nil {
+			s.logger.Infof("Group %q: %v", name, err)
 		}
 	}
 	return groups, nil
@@ -107,6 +113,8 @@ func (s *fileStore) ProfileList() ([]*storagepb.Profile, error) {
 		profile, err := s.ProfileGet(name)
 		if err == nil {
 			profiles = append(profiles, profile)
+		} else if s.logger != nil {
+			s.logger.Infof("Profile %q: %v", name, err)
 		}
 	}
 	return profiles, nil