feat(api,ui): enable websocket for all (#5249)

ovh · Jun 16, 2020 · 069cee4 · 069cee4
1 parent dbe51c2
commit 069cee4
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 1,328 deletions.
diff --git a/engine/api/api.go b/engine/api/api.go
@@ -237,7 +237,6 @@ type API struct {
 	SharedStorage       objectstore.Driver
 	StartupTime         time.Time
 	Maintenance         bool
-	eventsBroker        *eventsBroker
 	websocketBroker     *websocketBroker
 	Cache               cache.Store
 	Metrics             struct {

diff --git a/engine/api/api_routes.go b/engine/api/api_routes.go
@@ -30,16 +30,6 @@ func (api *API) InitRouter() {
 	r := api.Router
 
 	log.Info(api.Router.Background, "Initializing Events broker")
-	// Initialize event broker
-	api.eventsBroker = &eventsBroker{
-		router:   api.Router,
-		cache:    api.Cache,
-		clients:  make(map[string]*eventsBrokerSubscribe),
-		dbFunc:   api.DBConnectionFactory.GetDBMap,
-		messages: make(chan sdk.Event),
-	}
-	api.eventsBroker.Init(r.Background, api.PanicDump())
-
 	api.websocketBroker = &websocketBroker{
 		router:           api.Router,
 		cache:            api.Cache,
@@ -416,7 +406,6 @@ func (api *API) InitRouter() {
 	r.Handle("/workflow/hook/model/{model}", ScopeNone(), r.GET(api.getWorkflowHookModelHandler), r.POST(api.postWorkflowHookModelHandler, NeedAdmin(true)), r.PUT(api.putWorkflowHookModelHandler, NeedAdmin(true)))
 
 	// SSE
-	r.Handle("/events", ScopeNone(), r.GET(api.eventsBroker.ServeHTTP))
 	r.Handle("/ws", ScopeNone(), r.GET(api.websocketBroker.ServeHTTP))
 
 	// Feature

diff --git a/engine/api/events.go b/engine/api/events.go
diff --git a/engine/api/router.go b/engine/api/router.go
@@ -39,8 +39,6 @@ var (
 	onceMetrics         sync.Once
 	Errors              *stats.Int64Measure
 	Hits                *stats.Int64Measure
-	SSEClients          *stats.Int64Measure
-	SSEEvents           *stats.Int64Measure
 	WebSocketClients    *stats.Int64Measure
 	WebSocketEvents     *stats.Int64Measure
 	ServerRequestCount  *stats.Int64Measure
@@ -146,17 +144,8 @@ func (r *Router) recoverWrap(h http.HandlerFunc) http.HandlerFunc {
 					err = sdk.ErrUnknownError
 				}
 
-				// the SSE handler can panic, and it's the way gorilla/mux works :(
-				if strings.HasPrefix(req.URL.String(), "/events") {
-					msg := fmt.Sprintf("%v", err)
-					for _, s := range handledEventErrors {
-						if strings.Contains(msg, s) {
-							return
-						}
-					}
-				}
+				log.Error(context.TODO(), "[PANIC_RECOVERY] Panic occurred on %s:%s, recover %s", req.Method, req.URL.String(), err)
 
-				log.Error(req.Context(), "[PANIC_RECOVERY] Panic occurred on %s:%s", req.Method, req.URL.String())
 				trace := make([]byte, 4096)
 				count := runtime.Stack(trace, true)
 				log.Error(req.Context(), "[PANIC_RECOVERY] Stacktrace of %d bytes\n%s\n", count, trace)