Add /refresh to update sources and some configurations

martin/src/srv/server.rs

@@ -10,6 +10,7 @@ use actix_web::web::Data;
 use actix_web::{middleware, route, web, App, HttpResponse, HttpServer, Responder};
 use log::error;
 use serde::{Deserialize, Serialize};
+use std::sync::{Arc, RwLock};
 
 use crate::config::ServerState;
 use crate::source::TileCatalog;
@@ -79,8 +80,9 @@ async fn get_health() -> impl Responder {
     wrap = "middleware::Compress::default()"
 )]
 #[allow(clippy::unused_async)]
-async fn get_catalog(catalog: Data<Catalog>) -> impl Responder {
-    HttpResponse::Ok().json(catalog)
+async fn get_catalog(catalog: Data<Arc<RwLock<Catalog>>>) -> impl Responder {
+    let catalog_read = catalog.read().expect("Failed to acquire read lock on catalog");
+    HttpResponse::Ok().json(&*catalog_read)
 }
 
 pub fn router(cfg: &mut web::ServiceConfig) {
@@ -100,7 +102,9 @@ pub fn router(cfg: &mut web::ServiceConfig) {
 
 /// Create a new initialized Actix `App` instance together with the listening address.
 pub fn new_server(config: SrvConfig, state: ServerState) -> MartinResult<(Server, String)> {
-    let catalog = Catalog::new(&state)?;
+    let catalog = Arc::new(RwLock::new(Catalog::new(&state)?));
+
+
     let keep_alive = Duration::from_secs(config.keep_alive.unwrap_or(KEEP_ALIVE_DEFAULT));
     let worker_processes = config.worker_processes.unwrap_or_else(num_cpus::get);
     let listen_addresses = config

test.yml

@@ -0,0 +1,45 @@
+postgres:
+  connection_string: postgresql://admin:test@localhost:5433/geometries?
+  auto_publish: true
+  tables:
+    MixPoints:
+      schema: MixedCase
+      table: MixPoints
+      srid: 4326
+      geometry_column: Geom
+      bounds:
+      - -170.94984639004662
+      - -84.20025580733805
+      - 167.70892858284475
+      - 74.23573284753762
+      geometry_type: POINT
+      properties:
+        Gid: int4
+        TABLE: text
+    points1:
+      schema: public
+      table: points1
+      srid: 4326
+      geometry_column: geom
+      bounds:
+      - -179.27313970132585
+      - -67.52518563265659
+      - 162.60117193735186
+      - 84.93092095128937
+      geometry_type: POINT
+      properties:
+        gid: int4
+    points1_vw:
+      schema: public
+      table: points1_vw
+      srid: 4326
+      geometry_column: geom
+      bounds:
+      - -179.27313970132585
+      - -67.52518563265659
+      - 162.60117193735186
+      - 84.93092095128937
+      geometry_type: POINT
+      properties:
+        gid: int4
+  functions: {}