From d23927487c0a1d8cfbd7779f2a58229475642464 Mon Sep 17 00:00:00 2001
From: Marco Vanotti <mvanotti@dc.uba.ar>
Date: Sun, 11 Oct 2015 03:24:39 -0300
Subject: [PATCH] [minor] fix configLoad bug in mig-agent

If an error ocurred during configLoad function, it might not use the
builtin conf, but a half-overwritten one. This change defers the
Config overwrite until all the error-sensitive functions are called.
---
 mig-agent/agent.go  |  5 +++--
 mig-agent/config.go | 50 +++++++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/mig-agent/agent.go b/mig-agent/agent.go
index 028f62e5..4498c32f 100644
--- a/mig-agent/agent.go
+++ b/mig-agent/agent.go
@@ -123,9 +123,10 @@ func main() {
 	// attempt to read a local configuration file
 	err = configLoad(*config)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "[info] using builtin conf\n")
+		fmt.Fprintf(os.Stderr, "[error] Failed to load conf from %q, err: %v\n", *config, err)
+		fmt.Fprintf(os.Stderr, "[info] Using builtin conf.\n")
 	} else {
-		fmt.Fprintf(os.Stderr, "[info] Using external conf from %s\n", *config)
+		fmt.Fprintf(os.Stderr, "[info] Using external conf from %q\n", *config)
 	}
 	// if checkin mode is set in conf, enforce the mode
 	if CHECKIN && *mode == "agent" {
diff --git a/mig-agent/config.go b/mig-agent/config.go
index 533b2afb..7a828f55 100644
--- a/mig-agent/config.go
+++ b/mig-agent/config.go
@@ -9,9 +9,10 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
-	"mig.ninja/mig"
 	"time"
 
+	"mig.ninja/mig"
+
 	"gopkg.in/gcfg.v1"
 )
 
@@ -42,10 +43,30 @@ func configLoad(path string) (err error) {
 		}
 	}()
 	var config config
-	err = gcfg.ReadFileInto(&config, path)
+	if err = gcfg.ReadFileInto(&config, path); err != nil {
+		panic(err)
+	}
+	hbf, err := time.ParseDuration(config.Agent.HeartbeatFreq)
 	if err != nil {
 		panic(err)
 	}
+	timeout, err := time.ParseDuration(config.Agent.ModuleTimeout)
+	if err != nil {
+		panic(err)
+	}
+	agentkey, err := ioutil.ReadFile(config.Certs.Key)
+	if err != nil {
+		panic(err)
+	}
+	cacert, err := ioutil.ReadFile(config.Certs.Ca)
+	if err != nil {
+		panic(err)
+	}
+	agentcert, err := ioutil.ReadFile(config.Certs.Cert)
+	if err != nil {
+		panic(err)
+	}
+
 	ISIMMORTAL = config.Agent.IsImmortal
 	MUSTINSTALLSERVICE = config.Agent.InstallService
 	DISCOVERPUBLICIP = config.Agent.DiscoverPublicIP
@@ -53,25 +74,10 @@ func configLoad(path string) (err error) {
 	LOGGINGCONF = config.Logging
 	AMQPBROKER = config.Agent.Relay
 	APIURL = config.Agent.Api
-	HEARTBEATFREQ, err = time.ParseDuration(config.Agent.HeartbeatFreq)
-	if err != nil {
-		panic(err)
-	}
-	MODULETIMEOUT, err = time.ParseDuration(config.Agent.ModuleTimeout)
-	if err != nil {
-		panic(err)
-	}
-	CACERT, err = ioutil.ReadFile(config.Certs.Ca)
-	if err != nil {
-		panic(err)
-	}
-	AGENTCERT, err = ioutil.ReadFile(config.Certs.Cert)
-	if err != nil {
-		panic(err)
-	}
-	AGENTKEY, err = ioutil.ReadFile(config.Certs.Key)
-	if err != nil {
-		panic(err)
-	}
+	HEARTBEATFREQ = hbf
+	MODULETIMEOUT = timeout
+	CACERT = cacert
+	AGENTCERT = agentcert
+	AGENTKEY = agentkey
 	return
 }