1818
1919use std:: thread;
2020
21- use crate :: alerts:: ALERTS ;
22- use crate :: correlation:: CORRELATIONS ;
2321use crate :: handlers:: airplane;
2422use crate :: handlers:: http:: cluster:: { self , init_cluster_metrics_schedular} ;
2523use crate :: handlers:: http:: middleware:: { DisAllowRootUser , RouteExt } ;
@@ -28,22 +26,20 @@ use crate::handlers::http::{logstream, MAX_EVENT_PAYLOAD_SIZE};
2826use crate :: handlers:: http:: { rbac, role} ;
2927use crate :: hottier:: HotTierManager ;
3028use crate :: rbac:: role:: Action ;
31- use crate :: users:: dashboards:: DASHBOARDS ;
32- use crate :: users:: filters:: FILTERS ;
3329use crate :: { analytics, migration, storage, sync} ;
3430use actix_web:: web:: { resource, ServiceConfig } ;
3531use actix_web:: { web, Scope } ;
3632use actix_web_prometheus:: PrometheusMetrics ;
3733use async_trait:: async_trait;
3834use bytes:: Bytes ;
3935use tokio:: sync:: oneshot;
40- use tracing:: { error , info} ;
36+ use tracing:: info;
4137
4238use crate :: parseable:: PARSEABLE ;
4339use crate :: Server ;
4440
4541use super :: query:: { querier_ingest, querier_logstream, querier_rbac, querier_role} ;
46- use super :: { OpenIdClient , ParseableServer } ;
42+ use super :: { load_on_init , OpenIdClient , ParseableServer } ;
4743
4844pub struct QueryServer ;
4945
@@ -90,7 +86,6 @@ impl ParseableServer for QueryServer {
9086 ) ) ;
9187 }
9288
93- migration:: run_file_migration ( & PARSEABLE ) . await ?;
9489 let parseable_json = PARSEABLE . validate_storage ( ) . await ?;
9590 migration:: run_metadata_migration ( & PARSEABLE , & parseable_json) . await ?;
9691
@@ -109,22 +104,8 @@ impl ParseableServer for QueryServer {
109104
110105 //create internal stream at server start
111106 PARSEABLE . create_internal_stream_if_not_exists ( ) . await ?;
112-
113- if let Err ( e) = CORRELATIONS . load ( ) . await {
114- error ! ( "{e}" ) ;
115- }
116- if let Err ( err) = FILTERS . load ( ) . await {
117- error ! ( "{err}" )
118- } ;
119-
120- if let Err ( err) = DASHBOARDS . load ( ) . await {
121- error ! ( "{err}" )
122- } ;
123-
124- if let Err ( err) = ALERTS . load ( ) . await {
125- error ! ( "{err}" )
126- } ;
127-
107+ // load on init
108+ load_on_init ( ) . await ?;
128109 // track all parquet files already in the data directory
129110 storage:: retention:: load_retention_from_global ( ) ;
130111
@@ -150,11 +131,11 @@ impl ParseableServer for QueryServer {
150131
151132 let result = self
152133 . start ( shutdown_rx, prometheus. clone ( ) , PARSEABLE . options . openid ( ) )
153- . await ;
134+ . await ? ;
154135 // Cancel sync jobs
155136 cancel_tx. send ( ( ) ) . expect ( "Cancellation should not fail" ) ;
156137
157- result
138+ Ok ( result)
158139 }
159140}
160141
0 commit comments