Revert "Simplify grouped queue 2 (#912)" and "Fix flaky grouped-queue… (

#916)
instantdb · Feb 20, 2025 · 4320b74 · 4320b74
1 parent e41a268
commit 4320b74
Show file tree

Hide file tree

Showing 12 changed files with 609 additions and 460 deletions.
diff --git a/server/src/instant/flags_impl.clj b/server/src/instant/flags_impl.clj
@@ -8,7 +8,7 @@
             [instant.db.transaction :as tx]
             [instant.jdbc.aurora :as aurora]
             [instant.model.app :as app-model]
-            [instant.reactive.receive-queue :as receive-queue]
+            [instant.reactive.receive-queue :refer [receive-q]]
             [instant.reactive.session :as session]
             [instant.reactive.store :as store]
             [instant.util.instaql :refer [instaql-nodes->object-tree]]
@@ -65,7 +65,7 @@
           socket {:id socket-id
                   :http-req nil
                   :ws-conn ws-conn
-                  :receive-q receive-queue/receive-q
+                  :receive-q receive-q
                   :pending-handlers (atom #{})}]
 
       ;; Get results in foreground so that flags are initialized before we return
@@ -81,7 +81,7 @@
                                            :admin? true})
       (doseq [{:keys [query]} queries]
         (session/on-message {:id socket-id
-                             :receive-q receive-queue/receive-q
+                             :receive-q receive-q
                              :data (->json {:op :add-query
                                             :q query
                                             :return-type "tree"})}))

diff --git a/server/src/instant/gauges.clj b/server/src/instant/gauges.clj
@@ -106,7 +106,7 @@
                       (catch Throwable t
                         [{:path "instant.gauges.metric-fn-error"
                           :value (.getMessage t)}])))])]
-    (into {} (keep (juxt :path :value) metrics))))
+    (into {} (map (juxt :path :value) metrics))))
 
 (comment
   (gauges))