Skip to content

Fix ld logging config #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2020
Merged

Fix ld logging config #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions featureflag/featureflag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func NewClient(cfg *Config, logger logrus.FieldLogger) (Client, error) {
config.SendEvents = false
}

configureLogger(config.Loggers, logger)
configureLogger(&config.Loggers, logger)

if cfg.RelayHost != "" {
config.BaseUri = cfg.RelayHost
Expand Down Expand Up @@ -98,7 +98,7 @@ func (c *ldClient) AllEnabledFlags(key string) []string {
return flags
}

func configureLogger(ldLogger ldlog.Loggers, log logrus.FieldLogger) {
func configureLogger(ldLogger *ldlog.Loggers, log logrus.FieldLogger) {
if log == nil {
l := logrus.New()
l.SetOutput(ioutil.Discard)
Expand Down
19 changes: 19 additions & 0 deletions featureflag/featureflag_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package featureflag

import (
"bytes"
"testing"
"time"

"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/launchdarkly/go-server-sdk.v4/ldfiledata"
)
Expand Down Expand Up @@ -56,3 +59,19 @@ func TestAllEnabledFlags(t *testing.T) {

require.Equal(t, []string{"my-boolean-flag-key"}, flags)
}

func TestLogging(t *testing.T) {
cfg := Config{
Key: "ABCD",
RequestTimeout: time.Second,
Enabled: false,
}

logBuf := new(bytes.Buffer)
log := logrus.New()
log.Out = logBuf

_, err := NewClient(&cfg, log.WithField("component", "launch_darkly"))
require.NoError(t, err)
assert.NotEmpty(t, logBuf.Bytes())
}