Fix SIGHUP reload order: apply migrations first before reloading config. #93

Author: ignatz

trailbase-core/src/server/mod.rs

@@ -199,26 +199,11 @@ impl Server {
         loop {
           stream.recv().await;
 
-          info!("Received SIGHUP: re-loading config & re-applying migrations.");
+          info!("Received SIGHUP: re-apply migations then re-load config.");
 
-          // Reload config:
-          match crate::config::load_or_init_config_textproto(
-            state.data_dir(),
-            state.schema_metadata(),
-          )
-          .await
-          {
-            Ok(config) => {
-              if let Err(err) = state.validate_and_update_config(config, None).await {
-                error!("Failed to reload config: {err}");
-              }
-            }
-            Err(err) => {
-              error!("Failed to reload config: {err}");
-            }
-          }
-
-          // Re-apply migrations.
+          // Re-apply migrations. This needs to happen before reloading the config, which is
+          // consistent with the startup order. Otherwise, we may validate a configuration
+          // against a stale database schema.
           let user_migrations_path = state.data_dir().migrations_path();
           match state
             .conn()
@@ -229,8 +214,8 @@ impl Server {
             .await
           {
             Err(err) => {
-              // NOTE: it's not clear what the best error behavior here is. Should the server continue
-              // to run when migrations fail?
+              // NOTE: it's not clear what the best error behavior here is. Should the server
+              // continue to run when migrations fail?
               error!("Failed to apply migrations: {err}");
             }
             Ok(_new_db) => {
@@ -246,6 +231,23 @@ impl Server {
               }
             }
           }
+
+          // Reload config:
+          match crate::config::load_or_init_config_textproto(
+            state.data_dir(),
+            state.schema_metadata(),
+          )
+          .await
+          {
+            Ok(config) => {
+              if let Err(err) = state.validate_and_update_config(config, None).await {
+                error!("Failed to reload config: {err}");
+              }
+            }
+            Err(err) => {
+              error!("Failed to reload config: {err}");
+            }
+          }
         }
       });
     }