From 161dd4405474cc905e6912bab243509a3a6f88db Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.eu>
Date: Mon, 20 Apr 2020 01:01:13 +0200
Subject: GlobalOptions

---
 internal/yaml/yaml.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'internal/yaml/yaml.go')

diff --git a/internal/yaml/yaml.go b/internal/yaml/yaml.go
index 8cbace7..3317f5d 100644
--- a/internal/yaml/yaml.go
+++ b/internal/yaml/yaml.go
@@ -11,8 +11,9 @@ import (
 )
 
 type config struct {
-	GlobalConfig C.Map `yaml:",inline"`
-	Feeds        []configGroupFeed
+	C.GlobalOptions `yaml:",inline"`
+	GlobalConfig    C.Map `yaml:",inline"`
+	Feeds           []configGroupFeed
 }
 
 type group struct {
@@ -52,9 +53,10 @@ func (grpFeed *configGroupFeed) target() string {
 }
 
 func parse(buf []byte) (config, error) {
-	var parsedCfg config
+	parsedCfg := config{GlobalOptions: C.DefaultGlobalOptions}
+
 	if err := yaml.Unmarshal(buf, &parsedCfg); err != nil {
-		return parsedCfg, fmt.Errorf("while unmarshalling: %w", err)
+		return config{}, fmt.Errorf("while unmarshalling: %w", err)
 	}
 	//fmt.Printf("--- parsedCfg:\n%+v\n\n", parsedCfg)
 
-- 
cgit v1.2.3-70-g09d2