Skip to content
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.

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

Update log format #42

Merged
merged 4 commits into from
Sep 29, 2020
Merged
Changes from 1 commit
Commits
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
20 changes: 18 additions & 2 deletions cmd/sync/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ 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)
log.Printf("Updated HTTP servers of %v for group %v ; Added: %+v, Removed: %+v, Updated: %+v", upstream.Name, upstream.ScalingGroup, getUpstreamServerAddress(added), getUpstreamServerAddress(removed), getUpstreamServerAddress(updated))
LorcanMcVeigh marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
var upsServers []nginx.StreamUpstreamServer
Expand All @@ -150,7 +150,7 @@ 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)
log.Printf("Updated Stream servers of %v for group %v ; Added: %+v, Removed: %+v, Updated: %+v", upstream.Name, upstream.ScalingGroup, getStreamUpstreamServerAddress(added), getStreamUpstreamServerAddress(removed), getStreamUpstreamServerAddress(updated))
LorcanMcVeigh marked this conversation as resolved.
Show resolved Hide resolved
}
}

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

func getUpstreamServerAddress(server []nginx.UpstreamServer) []string {
Dean-Coakley marked this conversation as resolved.
Show resolved Hide resolved
LorcanMcVeigh marked this conversation as resolved.
Show resolved Hide resolved
var upstreamServerAddr []string
for _, s := range server {
upstreamServerAddr = append(upstreamServerAddr, s.Server)
}
return upstreamServerAddr
}

func getStreamUpstreamServerAddress(server []nginx.StreamUpstreamServer) []string {
LorcanMcVeigh marked this conversation as resolved.
Show resolved Hide resolved
var StreamUpstreamServerAddr []string
for _, s := range server {
StreamUpstreamServerAddr = append(StreamUpstreamServerAddr, s.Server)
}
return StreamUpstreamServerAddr
LorcanMcVeigh marked this conversation as resolved.
Show resolved Hide resolved
}