// Display changes
changes := s.formatChanges(resp)
if changes != "" {
- s.logf(safcm.LogInfo, true, "%s", changes)
+ s.log(safcm.LogInfo, true, changes)
}
if resp.Error != "" {
sort.Slice(priorities, func(i, j int) bool {
a := priorities[i]
b := priorities[j]
- return groupPriority[a] < groupPriority[b]
+ return groupPriority[a] > groupPriority[b]
})
- s.logVerbosef("host group priorities (desc. priority): %v",
+ s.logVerbosef("host group priorities (descending): %v",
strings.Join(priorities, " "))
}
return nil, nil, err
}
- // Early entries have higher priorities
+ // Early entries in "group_priority" have higher priorities
groupPriority := make(map[string]int)
for i, x := range s.config.GroupPriority {
- groupPriority[x] = math.MinInt32 + i + 1
+ groupPriority[x] = len(s.config.GroupPriority) - i
}
// Host itself always has highest priority
- groupPriority[s.host.Name] = math.MinInt32
+ groupPriority[s.host.Name] = math.MaxInt32
// Sort groups after priority and name
sort.Slice(groups, func(i, j int) bool {
a := groups[i]
b := groups[j]
- if groupPriority[a] > groupPriority[b] {
+ if groupPriority[a] < groupPriority[b] {
return true
- } else if groupPriority[a] < groupPriority[b] {
+ } else if groupPriority[a] > groupPriority[b] {
return false
} else {
return a < b
newPrio := groupPriority[group]
oldPrio := groupPriority[old.OrigGroup]
- if oldPrio > newPrio {
+ if oldPrio < newPrio {
if old.Mode.IsDir() && file.Mode.IsDir() &&
old.TriggerCommands != nil {
s.logDebugf("files: %q: "+
path, group, old.OrigGroup)
}
return nil
- } else if oldPrio < newPrio {
+ } else if oldPrio > newPrio {
// Should never happen, groups are sorted by priority
panic("invalid group priorities")
}
return nil
}
- return fmt.Errorf("groups %s and %s both provide file %q\n"+
+ return fmt.Errorf("groups %s and %s both provide %q\n"+
"Use 'group_priority' in config.yaml to declare preference",
group, old.OrigGroup, path)
}