Ensure subsystem logger has been created (#314)

This commit is contained in:
Joshua Spence
2023-02-28 11:38:54 +11:00
committed by GitHub
parent 7296c9d730
commit aa9f778363
2 changed files with 9 additions and 8 deletions

View File

@@ -16,16 +16,17 @@ import (
)
type lazyClient struct {
baseURL string
user string
pass string
insecure bool
baseURL string
user string
pass string
insecure bool
subsystem string
once sync.Once
inner *unifi.Client
}
func setHTTPClient(c *unifi.Client, insecure bool) {
func setHTTPClient(c *unifi.Client, insecure bool, subsystem string) {
httpClient := &http.Client{}
httpClient.Transport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
@@ -44,7 +45,7 @@ func setHTTPClient(c *unifi.Client, insecure bool) {
},
}
httpClient.Transport = logging.NewSubsystemLoggingHTTPTransport("Unifi", httpClient.Transport)
httpClient.Transport = logging.NewSubsystemLoggingHTTPTransport(subsystem, httpClient.Transport)
jar, _ := cookiejar.New(nil)
httpClient.Jar = jar
@@ -57,7 +58,7 @@ var initErr error
func (c *lazyClient) init(ctx context.Context) error {
c.once.Do(func() {
c.inner = &unifi.Client{}
setHTTPClient(c.inner, c.insecure)
setHTTPClient(c.inner, c.insecure, c.subsystem)
initErr = c.inner.SetBaseURL(c.baseURL)
if initErr != nil {

View File

@@ -36,7 +36,7 @@ func TestMain(m *testing.M) {
insecure := os.Getenv("UNIFI_INSECURE") == "true"
testClient = &unifi.Client{}
setHTTPClient(testClient, insecure)
setHTTPClient(testClient, insecure, "unifi")
testClient.SetBaseURL(baseURL)
err := testClient.Login(context.Background(), user, pass)
if err != nil {