github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-07-12 22:08:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix restart of steve aggregation

Browse Source
This commit is contained in:
Darren Shepherd 2021-08-16 22:05:50 -07:00
parent bcbcef36b3
commit e70fca2a42
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/aggregation/server.go
View File

@ -60,12 +60,24 @@ func ListenAndServe(ctx context.Context, url string, caCert []byte, token string
func serve(ctx context.Context, dialer websocket.Dialer, url string, headers http.Header, handler http.Handler) error { func serve(ctx context.Context, dialer websocket.Dialer, url string, headers http.Header, handler http.Handler) error {
url = strings.Replace(url, "http://", "ws://", 1) url = strings.Replace(url, "http://", "ws://", 1)
url = strings.Replace(url, "https://", "wss://", 1) url = strings.Replace(url, "https://", "wss://", 1)
conn, _, err := dialer.DialContext(ctx, url, headers)
// ensure we clean up everything on exit
ctx, cancel := context.WithCancel(ctx)
defer cancel()
dialCtx, dialCancel := context.WithTimeout(ctx, 5*time.Second)
defer dialCancel()
conn, _, err := dialer.DialContext(dialCtx, url, headers)
if err != nil { if err != nil {
return err return err
} }
defer conn.Close() defer conn.Close()
go func() {
<-ctx.Done()
conn.Close()
}()
listener := NewListener("steve") listener := NewListener("steve")
server := http.Server{ server := http.Server{
Handler: handler, Handler: handler,

2
pkg/aggregation/watch.go
View File

@ -85,7 +85,7 @@ func (h *handler) shouldRestart(secret *corev1.Secret) (string, []byte, string,
if h.url != url || if h.url != url ||
h.token != token || h.token != token ||
bytes.Equal(h.caCert, caCert) { !bytes.Equal(h.caCert, caCert) {
return url, caCert, token, true, nil return url, caCert, token, true, nil
} }