From 8aa071935e32ba9f502b9e24cc9c70d08481800d Mon Sep 17 00:00:00 2001
From: davidnewhall2 <david@sleepers.pro>
Date: Wed, 11 Dec 2019 01:14:09 -0800
Subject: [PATCH] add lock to getunifi

---
 Gopkg.lock           | 12 ++++++------
 pkg/poller/config.go | 12 +++++++-----
 pkg/poller/dumper.go |  4 ++--
 pkg/poller/start.go  |  6 +++++-
 pkg/poller/unifi.go  |  5 +++++
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 2d8bf8a7..615d1159 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -27,7 +27,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:50708c8fc92aec981df5c446581cf9f90ba9e2a5692118e0ce75d4534aaa14a2"
+  digest = "1:00e5ad58045d6d2a6c9e65d1809ff2594bc396e911712ae892a93976fdece115"
   name = "github.com/influxdata/influxdb1-client"
   packages = [
     "models",
@@ -35,7 +35,7 @@
     "v2",
   ]
   pruneopts = "UT"
-  revision = "fc22c7df067eefd070157f157893fbce961d6359"
+  revision = "8bf82d3c094dc06be9da8e5bf9d3589b6ea032ae"
 
 [[projects]]
   digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc"
@@ -103,15 +103,15 @@
   name = "golang.org/x/sys"
   packages = ["windows"]
   pruneopts = "UT"
-  revision = "eeba5f6aabab6d6594a9191d6bfeaca5fa6a8248"
+  revision = "ac6580df4449443a05718fd7858c1f91ad5f8d20"
 
 [[projects]]
-  digest = "1:87738e338f505d3e3be1f80d36b53f3c4e73be9b7ad4ccae46abbe9ef04f3f71"
+  digest = "1:2883cea734f2766f41ff9c9d4aefccccc53e3d44f5c8b08893b9c218cf666722"
   name = "golift.io/unifi"
   packages = ["."]
   pruneopts = "UT"
-  revision = "ba857a3a04311fed362cb43fa7bf4066bc3a7e55"
-  version = "v4.1.5"
+  revision = "a607fe940c6a563c6994f2c945394b19d2183b1c"
+  version = "v4.1.6"
 
 [[projects]]
   digest = "1:b75b3deb2bce8bc079e16bb2aecfe01eb80098f5650f9e93e5643ca8b7b73737"
diff --git a/pkg/poller/config.go b/pkg/poller/config.go
index 41847831..1725b03a 100644
--- a/pkg/poller/config.go
+++ b/pkg/poller/config.go
@@ -18,6 +18,7 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/BurntSushi/toml"
@@ -49,11 +50,12 @@ const ENVConfigPrefix = "UP_"
 
 // UnifiPoller contains the application startup data, and auth info for UniFi & Influx.
 type UnifiPoller struct {
-	Influx    *influxunifi.InfluxUnifi
-	Unifi     *unifi.Unifi
-	Flag      *Flag
-	Config    *Config
-	LastCheck time.Time
+	Influx     *influxunifi.InfluxUnifi
+	Unifi      *unifi.Unifi
+	Flag       *Flag
+	Config     *Config
+	LastCheck  time.Time
+	sync.Mutex // locks the Unifi struct member when re-authing to unifi.
 }
 
 // Flag represents the CLI args available and their settings.
diff --git a/pkg/poller/dumper.go b/pkg/poller/dumper.go
index da825485..09514e57 100644
--- a/pkg/poller/dumper.go
+++ b/pkg/poller/dumper.go
@@ -35,9 +35,9 @@ func (u *UnifiPoller) DumpJSONPayload() (err error) {
 	case err != nil:
 		return err
 	case StringInSlice(u.Flag.DumpJSON, []string{"d", "device", "devices"}):
-		return u.dumpSitesJSON(unifi.DevicePath, "Devices", sites)
+		return u.dumpSitesJSON(unifi.APIDevicePath, "Devices", sites)
 	case StringInSlice(u.Flag.DumpJSON, []string{"client", "clients", "c"}):
-		return u.dumpSitesJSON(unifi.ClientPath, "Clients", sites)
+		return u.dumpSitesJSON(unifi.APIClientPath, "Clients", sites)
 	case strings.HasPrefix(u.Flag.DumpJSON, "other "):
 		apiPath := strings.SplitN(u.Flag.DumpJSON, " ", 2)[1]
 		_, _ = fmt.Fprintf(os.Stderr, "[INFO] Dumping Path '%s':\n", apiPath)
diff --git a/pkg/poller/start.go b/pkg/poller/start.go
index d2c63083..8d8b9b5d 100644
--- a/pkg/poller/start.go
+++ b/pkg/poller/start.go
@@ -28,7 +28,10 @@ func New() *UnifiPoller {
 			SaveSites:  true,
 			HTTPListen: defaultHTTPListen,
 			Namespace:  appName,
-		}, Flag: &Flag{ConfigFile: DefaultConfFile},
+		},
+		Flag: &Flag{
+			ConfigFile: DefaultConfFile,
+		},
 	}
 }
 
@@ -125,6 +128,7 @@ func (u *UnifiPoller) PollController() {
 	for u.LastCheck = range ticker.C {
 		if err := u.CollectAndProcess(); err != nil {
 			u.LogErrorf("%v", err)
+			u.Unifi.CloseIdleConnections()
 			u.Unifi = nil // trigger re-auth in unifi.go.
 		}
 	}
diff --git a/pkg/poller/unifi.go b/pkg/poller/unifi.go
index ce9ac2e7..ba38a371 100644
--- a/pkg/poller/unifi.go
+++ b/pkg/poller/unifi.go
@@ -11,6 +11,11 @@ import (
 
 // GetUnifi returns a UniFi controller interface.
 func (u *UnifiPoller) GetUnifi() (err error) {
+	u.Lock()
+	defer u.Unlock()
+	if u.Unifi != nil {
+		u.Unifi.CloseIdleConnections()
+	}
 	// Create an authenticated session to the Unifi Controller.
 	u.Unifi, err = unifi.NewUnifi(&unifi.Config{
 		User:      u.Config.UnifiUser,