Skip to content

feat: add debug logging for merge behaviour #456

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
james-milligan merged 2 commits into from
Mar 2, 2023
Merged

feat: add debug logging for merge behaviour #456

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5085857
add debug logging
james-milligan Mar 2, 2023
6a9f11d
removed whitespacing for linting to pass
james-milligan Mar 2, 2023
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
56 changes: 49 additions & 7 deletions pkg/store/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ func (f *Flags) Add(logger *logger.Logger, source string, flags map[string]model
for k, newFlag := range flags {
storedFlag, ok := f.Get(k)
if ok && !f.hasPriority(storedFlag.Source, source) {
logger.Debug(
fmt.Sprintf(
"not overwriting: flag %s from source %s does not have priority over %s",
k,
source,
storedFlag.Source,
),
)
continue
}

Expand Down Expand Up @@ -118,6 +126,14 @@ func (f *Flags) Update(logger *logger.Logger, source string, flags map[string]mo
continue
}
if !f.hasPriority(storedFlag.Source, source) {
logger.Debug(
fmt.Sprintf(
"not updating: flag %s from source %s does not have priority over %s",
k,
source,
storedFlag.Source,
),
)
continue
}

Expand All @@ -135,6 +151,12 @@ func (f *Flags) Update(logger *logger.Logger, source string, flags map[string]mo

// DeleteFlags matching flags from source.
func (f *Flags) DeleteFlags(logger *logger.Logger, source string, flags map[string]model.Flag) map[string]interface{} {
logger.Debug(
fmt.Sprintf(
"store resync triggered: delete event from source %s",
source,
),
)
notifications := map[string]interface{}{}
if len(flags) == 0 {
allFlags := f.GetAll()
Expand All @@ -154,6 +176,14 @@ func (f *Flags) DeleteFlags(logger *logger.Logger, source string, flags map[stri
flag, ok := f.Get(k)
if ok {
if !f.hasPriority(flag.Source, source) {
logger.Debug(
fmt.Sprintf(
"not deleting: flag %s from source %s cannot be deleted by %s",
k,
flag.Source,
source,
),
)
continue
}
notifications[k] = map[string]interface{}{
Expand Down Expand Up @@ -181,7 +211,6 @@ func (f *Flags) Merge(
) (map[string]interface{}, bool) {
notifications := map[string]interface{}{}
resyncRequired := false

f.mx.Lock()
for k, v := range f.Flags {
if v.Source == source {
Expand All @@ -193,18 +222,33 @@ func (f *Flags) Merge(
"source": source,
}
resyncRequired = true
logger.Debug(
fmt.Sprintf(
"store resync triggered: flag %s has been deleted from source %s",
k, source,
),
)
continue
}
}
}
f.mx.Unlock()

for k, newFlag := range flags {
newFlag.Source = source

storedFlag, ok := f.Get(k)
if ok && (!f.hasPriority(storedFlag.Source, source) || reflect.DeepEqual(storedFlag, newFlag)) {
continue
if ok {
if !f.hasPriority(storedFlag.Source, source) {
logger.Debug(
fmt.Sprintf(
"not merging: flag %s from source %s does not have priority over %s",
k, source, storedFlag.Source,
),
)
continue
}
if reflect.DeepEqual(storedFlag, newFlag) {
continue
}
}
if !ok {
notifications[k] = map[string]interface{}{
Expand All @@ -217,10 +261,8 @@ func (f *Flags) Merge(
"source": source,
}
}

// Store the new version of the flag
f.Set(k, newFlag)
}

return notifications, resyncRequired
}