Skip to content

Commit 98e64c8

Browse files
djach7kgiusti
authored andcommitted
fix: remove error message from clean systemd shutdown
Signed-off-by: djach7 <djachimo@redhat.com>
1 parent 01a7aa7 commit 98e64c8

3 files changed

Lines changed: 30 additions & 6 deletions

File tree

cmd/manufacturing.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,17 @@ func (s *ManufacturingServer) Start() error {
154154
MinVersion: tls.VersionTLS12,
155155
CipherSuites: preferredCipherSuites,
156156
}
157-
return srv.ServeTLS(lis, s.config.CertPath, s.config.KeyPath)
157+
err := srv.ServeTLS(lis, s.config.CertPath, s.config.KeyPath)
158+
if err != nil && err != http.ErrServerClosed {
159+
return err
160+
}
161+
return nil
158162
}
159-
return srv.Serve(lis)
163+
err = srv.Serve(lis)
164+
if err != nil && err != http.ErrServerClosed {
165+
return err
166+
}
167+
return nil
160168
}
161169

162170
func serveManufacturing(config *ManufacturingServerConfig) error {

cmd/owner.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,17 @@ func (s *OwnerServer) Start() error {
175175
MinVersion: tls.VersionTLS12,
176176
CipherSuites: preferredCipherSuites,
177177
}
178-
return srv.ServeTLS(lis, s.config.CertPath, s.config.KeyPath)
178+
err := srv.ServeTLS(lis, s.config.CertPath, s.config.KeyPath)
179+
if err != nil && err != http.ErrServerClosed {
180+
return err
181+
}
182+
return nil
179183
}
180-
return srv.Serve(lis)
184+
err = srv.Serve(lis)
185+
if err != nil && err != http.ErrServerClosed {
186+
return err
187+
}
188+
return nil
181189
}
182190

183191
type OwnerServerState struct {

cmd/rendezvous.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,17 @@ func (s *RendezvousServer) Start() error {
111111
MinVersion: tls.VersionTLS12,
112112
CipherSuites: preferredCipherSuites,
113113
}
114-
return srv.ServeTLS(lis, s.config.CertPath, s.config.KeyPath)
114+
err := srv.ServeTLS(lis, s.config.CertPath, s.config.KeyPath)
115+
if err != nil && err != http.ErrServerClosed {
116+
return err
117+
}
118+
return nil
115119
}
116-
return srv.Serve(lis)
120+
err = srv.Serve(lis)
121+
if err != nil && err != http.ErrServerClosed {
122+
return err
123+
}
124+
return nil
117125
}
118126

119127
type RendezvousServerState struct {

0 commit comments

Comments
 (0)