From d0b462523bf146b90b43d4ef9c9630ebd3c1b3c6 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Fri, 21 Jun 2019 04:29:07 -0700
Subject: [PATCH] fixes

---
 examples/up.json.example   |  2 +-
 examples/up.xml.example    | 56 +++++++++++++++++++++++++++++++++-----
 pkg/unifi-poller/poller.go |  4 +--
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/examples/up.json.example b/examples/up.json.example
index bc3f408b..2d2c415f 100644
--- a/examples/up.json.example
+++ b/examples/up.json.example
@@ -9,7 +9,7 @@
  "influx_pass": "unifi",
  "influx_db": "unifi",
  "unifi_user": "influxdb",
- "unifi_pass": "4BB9345C-2341-48D7-99F5-E01B583FF77F",
+ "unifi_pass": "",
  "unifi_url": "https://127.0.0.1:8443",
  "verify_ssl": false
 }
diff --git a/examples/up.xml.example b/examples/up.xml.example
index dfb6a07f..c7d28a72 100644
--- a/examples/up.xml.example
+++ b/examples/up.xml.example
@@ -1,15 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+########################################################
+# unifi-poller primary configuration file. XML FORMAT #
+# provided values are defaults                         #
+########################################################
+-->
+
+<!--
+If the controller has more than one site, specify which sites to poll here.
+If only one site, "default" is likely the correct name.
+Set this to ["all"] to poll all sites, no matter their names.
+Add more sites by adding additional lines:
+<sites>site1</sites>
+<sites>site2</sites>
+-->
+<sites>default</sites>
+
+<!--
+The Unifi Controller only updates traffic stats about every 30 seconds.
+Setting this to something lower may lead to "zeros" in your data. You've been warned.
+-->
+<interval>30s</interval>
+
+<!-- Turns on line numbers, microsecond logging, and a per-device log. -->
 <debug>false</debug>
+
+<!--
+Turns off per-device log and per-interval log. Logs only errors.
+Recommend using debug with this setting for better error logging.
+-->
+<quiet>false</quiet>
+
+<!--
+# If the poller experiences an error from the Unifi Controller or from InfluxDB
+# it will exit. If you do not want it to exit, change max_errors to -1. You can
+# adjust the config to tolerate more errors by setting this to a higher value.
+# Recommend setting this between 0 and 5. See man page for more explanation.
+-->
+<max_errors>0</max_errors>
+
+<!-- InfluxDB does not require auth by default, so the user/password are probably unimportant. -->
 <influx_db>unifi</influx_db>
 <influx_pass>unifi</influx_pass>
 <influx_url>http://127.0.0.1:8086</influx_url>
 <influx_user>unifi</influx_user>
-<interval>30s</interval>
-<max_errors>0</max_errors>
-<quiet>false</quiet>
-<sites>default</sites>
-<sites>site2</sites>
-<unifi_pass>4BB9345C-2341-48D7-99F5-E01B583FF77F</unifi_pass>
-<unifi_url>https://127.0.0.1:8443</unifi_url>
+
+
+<!-- Make a read-only user in the Unifi Admin Settings. -->
 <unifi_user>influxdb</unifi_user>
+<unifi_pass></unifi_pass>
+<unifi_url>https://127.0.0.1:8443</unifi_url>
+<!--
+If your Unifi controller has a valid SSL certificate, you can enable
+this option to validate it. Otherwise, any SSL certificate is valid.
+-->
 <verify_ssl>false</verify_ssl>
diff --git a/pkg/unifi-poller/poller.go b/pkg/unifi-poller/poller.go
index ba75d2ec..203bd684 100644
--- a/pkg/unifi-poller/poller.go
+++ b/pkg/unifi-poller/poller.go
@@ -49,14 +49,14 @@ func (u *UnifiPoller) GetConfig() (err error) {
 	switch buf, err = ioutil.ReadFile(u.ConfigFile); {
 	case err != nil:
 		return err
-	default:
-		err = toml.Unmarshal(buf, u.Config)
 	case strings.HasSuffix(u.ConfigFile, ".json"):
 		err = json.Unmarshal(buf, u.Config)
 	case strings.HasSuffix(u.ConfigFile, ".xml"):
 		err = xml.Unmarshal(buf, u.Config)
 	case strings.HasSuffix(u.ConfigFile, ".yaml"):
 		err = yaml.Unmarshal(buf, u.Config)
+	default:
+		err = toml.Unmarshal(buf, u.Config)
 	}
 	if err != nil {
 		return err