Merge pull request #108 from wesen/bug/fix-hanging-query-handler-error

Fix datatables render hanging on middleware errors
go-go-golems · Feb 7, 2025 · f61fd8c · f61fd8c
2 parents 52c569a + 02b1439
commit f61fd8c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/glazed/handlers/datatables/datatables.go b/pkg/glazed/handlers/datatables/datatables.go
@@ -220,6 +220,7 @@ func (qh *QueryHandler) Handle(c echo.Context) error {
 				log.Debug().Msg("Error stream full")
 			}
 			log.Debug().Msg("Closing error stream")
+			close(dt_.ErrorStream)
 
 			return nil
 		})
@@ -236,7 +237,12 @@ func (qh *QueryHandler) Handle(c echo.Context) error {
 
 		g.Go(func() error {
 			log.Debug().Msg("Rendering template")
-			return qh.renderTemplate(parsedLayers, c.Response(), dt_, columnsC)
+			err := qh.renderTemplate(parsedLayers, c.Response(), dt_, columnsC)
+			log.Debug().Msg("Template rendered")
+			if err != nil {
+				return err
+			}
+			return nil
 		})
 
 		return g.Wait()