Skip to content

Commit f3c2f99

Browse files
bitfehleroktalz
authored andcommitted
BUG/MINOR: quit after printing version when invoked with -v
1 parent 402c43c commit f3c2f99

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

main.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ func main() {
7171
return
7272
}
7373
logger.ShowFilename(false)
74-
logInfo(logger, osArgs)
74+
exit := logInfo(logger, osArgs)
75+
if exit {
76+
return
77+
}
7578
logger.ShowFilename(true)
7679

7780
// backwards compatibility with 1.7
@@ -131,7 +134,7 @@ func main() {
131134
close(stop)
132135
}
133136

134-
func logInfo(logger utils.Logger, osArgs utils.OSArgs) {
137+
func logInfo(logger utils.Logger, osArgs utils.OSArgs) bool {
135138
if len(osArgs.Version) > 0 {
136139
fmt.Printf("HAProxy Ingress Controller %s %s%s", GitTag, GitCommit, GitDirty)
137140
fmt.Printf("Build from: %s", GitRepo)
@@ -141,7 +144,7 @@ func logInfo(logger utils.Logger, osArgs utils.OSArgs) {
141144
fmt.Printf("Ingress class: %s", osArgs.IngressClass)
142145
fmt.Printf("Empty Ingress class: %t", osArgs.EmptyIngressClass)
143146
}
144-
return
147+
return true
145148
}
146149

147150
logger.Print(IngressControllerInfo)
@@ -195,6 +198,7 @@ func logInfo(logger utils.Logger, osArgs utils.OSArgs) {
195198
hostname, err := os.Hostname()
196199
logger.Error(err)
197200
logger.Printf("Running on %s", hostname)
201+
return false
198202
}
199203

200204
func getNamespaceValue(name string) *utils.NamespaceValue {

0 commit comments

Comments
 (0)