hugolib: Log WARNING only on unknown /data files
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 18 Apr 2017 16:47:37 +0000 (18:47 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 18 Apr 2017 16:47:37 +0000 (18:47 +0200)
Fixes #3361

hugolib/datafiles_test.go
hugolib/site.go

index 3aac3201f358775684b42a2316591129818636ee..5beb5924942242f05dbe3c206a72e76762333893 100644 (file)
@@ -98,15 +98,6 @@ func TestDataDirMultipleSources(t *testing.T) {
 
 }
 
-func TestDataDirUnknownFormat(t *testing.T) {
-       t.Parallel()
-
-       sources := []source.ByteSource{
-               {Name: filepath.FromSlash("data/test.roml"), Content: []byte("boo")},
-       }
-       doTestDataDir(t, true, sources)
-}
-
 func doTestDataDir(t *testing.T, expected interface{}, sources []source.ByteSource, configKeyValues ...interface{}) {
        var (
                cfg, fs = newTestCfg()
index d8e40f039f037f5401adb6acd6d92c0d5af5c90b..3b7d47533ab9cb4b04ff14a2beaef1c24db60258 100644 (file)
@@ -841,7 +841,8 @@ func (s *Site) loadData(sources []source.Input) (err error) {
 
                        data, err := s.readData(r)
                        if err != nil {
-                               return fmt.Errorf("Failed to read data from %s: %s", filepath.Join(r.Path(), r.LogicalName()), err)
+                               s.Log.WARN.Printf("Failed to read data from %s: %s", filepath.Join(r.Path(), r.LogicalName()), err)
+                               continue
                        }
 
                        if data == nil {