Dont append to slices in mergeStruct

influxdata · Nov 18, 2015 · 4be19fb · 4be19fb
1 parent 19e5d97
commit 4be19fb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/agent.go b/agent.go
@@ -176,11 +176,13 @@ func (a *Agent) LoadPlugins(filters []string, config *Config) ([]string, error)
 	var names []string
 
 	for name, plugin := range config.PluginsDeclared() {
+		fmt.Println("Declared plugin: ", plugin)
 		if sliceContains(name, filters) || len(filters) == 0 {
 			config, err := config.ApplyPlugin(name, plugin)
 			if err != nil {
 				return nil, err
 			}
+			fmt.Println("Applied plugin: ", plugin)
 
 			a.plugins = append(a.plugins, &runningPlugin{name, plugin, config})
 			names = append(names, name)

diff --git a/config.go b/config.go
@@ -405,11 +405,12 @@ func mergeStruct(base, overlay interface{}, fields []string) error {
 				overlayValue.Type(), field)
 		}
 		baseFieldValue := findField(field, baseValue)
-		if overlayFieldValue.Kind() == reflect.Slice {
-			baseFieldValue.Set(reflect.AppendSlice(baseFieldValue, overlayFieldValue))
-		} else {
-			baseFieldValue.Set(overlayFieldValue)
-		}
+		baseFieldValue.Set(overlayFieldValue)
+		// if overlayFieldValue.Kind() == reflect.Slice {
+		// 	baseFieldValue.Set(reflect.AppendSlice(baseFieldValue, overlayFieldValue))
+		// } else {
+		// 	baseFieldValue.Set(overlayFieldValue)
+		// }
 	}
 	return nil
 }

diff --git a/plugins/apache/apache.go b/plugins/apache/apache.go
@@ -34,6 +34,7 @@ func (n *Apache) Description() string {
 func (n *Apache) Gather(acc plugins.Accumulator) error {
 	var wg sync.WaitGroup
 	var outerr error
+	fmt.Println(n.Urls)
 
 	for _, u := range n.Urls {
 		addr, err := url.Parse(u)