From bf8c46556093a0d79e92e4bed101677196c9de52 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Fri, 21 Jun 2019 04:56:17 -0700
Subject: [PATCH] Fix logging

---
 integrations/promunifi/.travis.yml            |  1 -
 .../promunifi/cmd/unifi-poller/start.go       |  1 +
 .../promunifi/pkg/unifi-poller/poller.go      | 21 +++++++------------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/integrations/promunifi/.travis.yml b/integrations/promunifi/.travis.yml
index e8ab9d95..c3608b3e 100644
--- a/integrations/promunifi/.travis.yml
+++ b/integrations/promunifi/.travis.yml
@@ -38,7 +38,6 @@ after_success:
   - ls -l release/
   - |
       declare -r SSH_FILE="$(mktemp -u $HOME/.ssh/XXXXX)"
-
       echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
       # Get deploy key for golift/homebrew-mugs.
       openssl aes-256-cbc -K $encrypted_9f3147001275_key -iv $encrypted_9f3147001275_iv -in ".travis/github_deploy_key.enc" -out "$SSH_FILE" -d
diff --git a/integrations/promunifi/cmd/unifi-poller/start.go b/integrations/promunifi/cmd/unifi-poller/start.go
index 383ac91f..5ed7608f 100644
--- a/integrations/promunifi/cmd/unifi-poller/start.go
+++ b/integrations/promunifi/cmd/unifi-poller/start.go
@@ -9,6 +9,7 @@ import (
 )
 
 func main() {
+	log.SetFlags(log.LstdFlags)
 	unifi := &unifipoller.UnifiPoller{}
 	if unifi.ParseFlags(os.Args[1:]); unifi.ShowVer {
 		fmt.Printf("unifi-poller v%s\n", unifipoller.Version)
diff --git a/integrations/promunifi/pkg/unifi-poller/poller.go b/integrations/promunifi/pkg/unifi-poller/poller.go
index 203bd684..a2ab555e 100644
--- a/integrations/promunifi/pkg/unifi-poller/poller.go
+++ b/integrations/promunifi/pkg/unifi-poller/poller.go
@@ -44,29 +44,22 @@ func (u *UnifiPoller) GetConfig() (err error) {
 		UnifiBase:  defaultUnifURL,
 		Interval:   Dur{defaultInterval},
 		Sites:      []string{"default"},
+		Quiet:      u.DumpJSON != "",
 	}
+	u.Logf("Loading Configuration File: %s", u.ConfigFile)
 	var buf []byte
 	switch buf, err = ioutil.ReadFile(u.ConfigFile); {
 	case err != nil:
 		return err
 	case strings.HasSuffix(u.ConfigFile, ".json"):
-		err = json.Unmarshal(buf, u.Config)
+		return json.Unmarshal(buf, u.Config)
 	case strings.HasSuffix(u.ConfigFile, ".xml"):
-		err = xml.Unmarshal(buf, u.Config)
+		return xml.Unmarshal(buf, u.Config)
 	case strings.HasSuffix(u.ConfigFile, ".yaml"):
-		err = yaml.Unmarshal(buf, u.Config)
+		return yaml.Unmarshal(buf, u.Config)
 	default:
-		err = toml.Unmarshal(buf, u.Config)
+		return toml.Unmarshal(buf, u.Config)
 	}
-	if err != nil {
-		return err
-	}
-
-	if u.DumpJSON != "" {
-		u.Quiet = true
-	}
-	u.Logf("Loaded Configuration: %s", u.ConfigFile)
-	return nil
 }
 
 // Run invokes all the application logic and routines.
@@ -74,7 +67,7 @@ func (u *UnifiPoller) Run() (err error) {
 	if u.DumpJSON != "" {
 		return u.DumpJSONPayload()
 	}
-	if log.SetFlags(0); u.Debug {
+	if u.Debug {
 		log.SetFlags(log.Lshortfile | log.Lmicroseconds | log.Ldate)
 		u.LogDebugf("Debug Logging Enabled")
 	}