Merge branch 'master' into gzip-support

config.go

@@ -4,6 +4,7 @@ package main
 
 import (
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/BurntSushi/toml"
@@ -42,6 +43,7 @@ func LoadConfigs(configFiles []string) (*Config, error) {
 		if err != nil {
 			continue
 		} else {
+			log.Println("Using config file:", filename)
 			hasConfig = true
 			// Merge configs
 			if err := mergo.Merge(config, tmp); err != nil {

etc/ecix/birdwatcher.conf

@@ -42,13 +42,13 @@ requests_per_minute = 10
 [bird]
 listen = "0.0.0.0:29188"
 config = "/etc/bird.conf"
-birdc  = "birdc"
+birdc  = "/sbin/birdc"
 
 
 [bird6]
 listen = "0.0.0.0:29189"
 config = "/etc/bird6.conf"
-birdc  = "birdc6"
+birdc  = "/sbin/birdc6"
 
 [parser]
 # Remove fields e.g. interface