Skip to content

Update log format #42

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 4 commits into from
Sep 29, 2020
Merged

Update log format #42

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a93a773
Update log format
LorcanMcVeigh Sep 21, 2020
6e19abf
Apply suggestions from code review
LorcanMcVeigh Sep 22, 2020
3837c99
Apply suggestions from code review
LorcanMcVeigh Sep 29, 2020
3195f98
Add changes from feedback
LorcanMcVeigh Sep 29, 2020
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
28 changes: 26 additions & 2 deletions cmd/sync/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ func main() {
}

if len(added) > 0 || len(removed) > 0 || len(updated) > 0 {
log.Printf("Updated HTTP servers of %v; Added: %+v, Removed: %+v, Updated: %+v", upstream, added, removed, updated)
addedAddresses := getUpstreamServerAddresses(added)
removedAddresses := getUpstreamServerAddresses(removed)
updatedAddresses := getUpstreamServerAddresses(updated)
log.Printf("Updated HTTP servers of %v for group %v ; Added: %+v, Removed: %+v, Updated: %+v",
upstream.Name, upstream.ScalingGroup, addedAddresses, removedAddresses, updatedAddresses)
}
} else {
var upsServers []nginx.StreamUpstreamServer
Expand All @@ -150,7 +154,11 @@ func main() {
}

if len(added) > 0 || len(removed) > 0 || len(updated) > 0 {
log.Printf("Updated Stream servers of %v; Added: %+v, Removed: %+v, Updated: %+v", upstream, added, removed, updated)
addedAddresses := getStreamUpstreamServerAddresses(added)
removedAddresses := getStreamUpstreamServerAddresses(removed)
updatedAddresses := getStreamUpstreamServerAddresses(updated)
log.Printf("Updated Stream servers of %v for group %v ; Added: %+v, Removed: %+v, Updated: %+v",
upstream.Name, upstream.ScalingGroup, addedAddresses, removedAddresses, updatedAddresses)
}
}

Expand All @@ -164,3 +172,19 @@ func main() {
}
}
}

func getUpstreamServerAddresses(server []nginx.UpstreamServer) []string {
var upstreamServerAddr []string
for _, s := range server {
upstreamServerAddr = append(upstreamServerAddr, s.Server)
}
return upstreamServerAddr
}

func getStreamUpstreamServerAddresses(server []nginx.StreamUpstreamServer) []string {
var streamUpstreamServerAddr []string
for _, s := range server {
streamUpstreamServerAddr = append(streamUpstreamServerAddr, s.Server)
}
return streamUpstreamServerAddr
}