From d648b80f1aa00903427e730483b36a9c3206aea3 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Wed, 12 Jun 2019 23:40:11 -0700
Subject: [PATCH] More cleanup.

---
 core/poller/cmd/unifi-poller/main.go  | 31 +++++++++++++--------------
 core/poller/cmd/unifi-poller/unifi.go | 10 +++++----
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/core/poller/cmd/unifi-poller/main.go b/core/poller/cmd/unifi-poller/main.go
index adba6deb..dbf9c11f 100644
--- a/core/poller/cmd/unifi-poller/main.go
+++ b/core/poller/cmd/unifi-poller/main.go
@@ -17,7 +17,7 @@ func main() {
 	u := &UnifiPoller{}
 	if u.ParseFlags(os.Args[1:]); u.ShowVer {
 		fmt.Printf("unifi-poller v%s\n", Version)
-		os.Exit(0) // don't run anything else.
+		return // don't run anything else.
 	}
 	if err := u.GetConfig(); err != nil {
 		u.Flag.Usage()
@@ -66,7 +66,7 @@ func (u *UnifiPoller) GetConfig() error {
 		u.Quiet = true
 	}
 	if !u.Config.Quiet {
-		log.Println("Loaded Configuration:", u.ConfigFile)
+		log.Println("[INFO] Loaded Configuration:", u.ConfigFile)
 	}
 	return nil
 }
@@ -75,29 +75,28 @@ func (u *UnifiPoller) GetConfig() error {
 func (u *UnifiPoller) Run() error {
 	c := u.Config
 	if u.DumpJSON != "" {
-		if err := c.DumpJSON(u.DumpJSON); err != nil {
-			log.Fatalln("[ERROR] dumping JSON:", err)
-		}
-		return nil
+		return c.DumpJSON(u.DumpJSON)
 	}
-	log.Println("Unifi-Poller Starting Up! PID:", os.Getpid())
+	if log.SetFlags(0); c.Debug {
+		log.SetFlags(log.Lshortfile | log.Lmicroseconds | log.Ldate)
+		log.Println("[DEBUG] Debug Logging Enabled")
+	}
+	log.Printf("[INFO] Unifi-Poller v%v Starting Up! PID: %d", Version, os.Getpid())
 	// Create an authenticated session to the Unifi Controller.
 	controller, err := unifi.NewUnifi(c.UnifiUser, c.UnifiPass, c.UnifiBase, c.VerifySSL)
 	if err != nil {
 		return errors.Wrap(err, "unifi controller")
 	}
+	if c.Debug {
+		controller.DebugLog = log.Printf // Log debug messages.
+	}
+	controller.ErrorLog = log.Printf // Log all errors.
 	if !c.Quiet {
-		log.Println("Authenticated to Unifi Controller @", c.UnifiBase, "as user", c.UnifiUser)
+		log.Println("[INFO] Authenticated to Unifi Controller @", c.UnifiBase, "as user", c.UnifiUser)
 	}
 	if err := c.CheckSites(controller); err != nil {
 		return err
 	}
-	controller.ErrorLog = log.Printf // Log all errors.
-	if log.SetFlags(0); c.Debug {
-		log.Println("Debug Logging Enabled")
-		log.SetFlags(log.Lshortfile | log.Lmicroseconds | log.Ldate)
-		controller.DebugLog = log.Printf // Log debug messages.
-	}
 	infdb, err := influx.NewHTTPClient(influx.HTTPConfig{
 		Addr:     c.InfluxURL,
 		Username: c.InfluxUser,
@@ -110,8 +109,8 @@ func (u *UnifiPoller) Run() error {
 		// Doing it this way allows debug error logs (line numbers, etc)
 		controller.DebugLog = nil
 	} else {
-		log.Println("Logging Unifi Metrics to InfluXDB @", c.InfluxURL, "as user", c.InfluxUser)
-		log.Printf("Polling Unifi Controller (sites %v), interval: %v", c.Sites, c.Interval.value)
+		log.Println("[INFO] Polling Unifi Controller Sites:", c.Sites)
+		log.Println("[INFO] Logging Measurements to InfluxDB at", c.InfluxURL, "as user", c.InfluxUser)
 	}
 	c.PollUnifiController(controller, infdb)
 	return nil
diff --git a/core/poller/cmd/unifi-poller/unifi.go b/core/poller/cmd/unifi-poller/unifi.go
index 3db402c6..83a55136 100644
--- a/core/poller/cmd/unifi-poller/unifi.go
+++ b/core/poller/cmd/unifi-poller/unifi.go
@@ -21,7 +21,7 @@ func (c *Config) CheckSites(controller *unifi.Unifi) error {
 		for _, site := range sites {
 			msg = append(msg, site.Name+" ("+site.Desc+")")
 		}
-		log.Printf("Found %d site(s) on controller: %v", len(msg), strings.Join(msg, ", "))
+		log.Printf("[INFO] Found %d site(s) on controller: %v", len(msg), strings.Join(msg, ", "))
 	}
 	if StringInSlice("all", c.Sites) {
 		return nil
@@ -40,7 +40,7 @@ FIRST:
 
 // PollUnifiController runs forever, polling and pushing.
 func (c *Config) PollUnifiController(controller *unifi.Unifi, infdb influx.Client) {
-	log.Println("[INFO] Everything checks out! Beginning Poller Routine.")
+	log.Println("[INFO] Everything checks out! Poller started, interval:", c.Interval.value)
 	ticker := time.NewTicker(c.Interval.value)
 
 	for range ticker.C {
@@ -73,8 +73,10 @@ func (c *Config) PollUnifiController(controller *unifi.Unifi, infdb influx.Clien
 		}
 		// Talk about the data.
 		if !c.Quiet {
-			log.Printf("[INFO] Logged Unifi States. Sites: %d Clients: %d, Wireless APs: %d, Gateways: %d, Switches: %d",
-				len(sites), len(clients.UCLs), len(devices.UAPs), len(devices.USGs), len(devices.USWs))
+			log.Printf("[INFO] Unifi Measurements Recorded. Sites: %d Clients: %d, "+
+				"Wireless APs: %d, Gateways: %d, Switches: %d, Metrics: %d",
+				len(sites), len(clients.UCLs),
+				len(devices.UAPs), len(devices.USGs), len(devices.USWs), len(bp.Points()))
 		}
 	}
 }