Skip to content

Commit 589e116

Browse files
fix nil pointer references
Signed-off-by: Ethan J. Gallant <[email protected]> Co-authored-by: William Van Hevelingen <[email protected]> Co-authored-by: Stephanie Palis <[email protected]>
1 parent c5c3d5b commit 589e116

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

web/tls_config.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func ServeMultiple(listeners []net.Listener, server *http.Server, flags *FlagCon
203203
// WebSystemdSocket in the FlagConfig is true. The FlagConfig is also passed on
204204
// to ServeMultiple.
205205
func ListenAndServe(server *http.Server, flags *FlagConfig, logger log.Logger) error {
206-
if *flags.WebSystemdSocket {
206+
if flags.WebSystemdSocket != nil && *flags.WebSystemdSocket {
207207
level.Info(logger).Log("msg", "Listening on systemd activated listeners instead of port listeners.")
208208
listeners, err := activation.Listeners()
209209
if err != nil {
@@ -214,6 +214,11 @@ func ListenAndServe(server *http.Server, flags *FlagConfig, logger log.Logger) e
214214
}
215215
return ServeMultiple(listeners, server, flags, logger)
216216
}
217+
218+
if flags.WebListenAddresses == nil {
219+
*flags.WebListenAddresses = []string{":9090"}
220+
}
221+
217222
listeners := make([]net.Listener, 0, len(*flags.WebListenAddresses))
218223
for _, address := range *flags.WebListenAddresses {
219224
listener, err := net.Listen("tcp", address)

0 commit comments

Comments
 (0)