Merge branch 'dev' into federation

[lemmy.git] / server / src / settings.rs

diff --git a/server/src/settings.rs b/server/src/settings.rs
index 216c057e4ee7fcdd180c9a757618750a2cd6e324..8c3cd6a1251d035b7220a43f5e7440e266220767 100644 (file)
--- a/server/src/settings.rs
+++ b/server/src/settings.rs
@@ -4,11 +4,12 @@ use serde::Deserialize;
 use std::env;
 use std::fs;
 use std::net::IpAddr;
+use std::sync::RwLock;
 
 static CONFIG_FILE_DEFAULTS: &str = "config/defaults.hjson";
 static CONFIG_FILE: &str = "config/config.hjson";
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct Settings {
   pub setup: Option<Setup>,
   pub database: Database,
@@ -19,10 +20,10 @@ pub struct Settings {
   pub front_end_dir: String,
   pub rate_limit: RateLimitConfig,
   pub email: Option<EmailConfig>,
-  pub federation_enabled: bool,
+  pub federation: Federation,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct Setup {
   pub admin_username: String,
   pub admin_password: String,
@@ -30,7 +31,7 @@ pub struct Setup {
   pub site_name: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct RateLimitConfig {
   pub message: i32,
   pub message_per_second: i32,
@@ -40,7 +41,7 @@ pub struct RateLimitConfig {
   pub register_per_second: i32,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct EmailConfig {
   pub smtp_server: String,
   pub smtp_login: Option<String>,
@@ -49,7 +50,7 @@ pub struct EmailConfig {
   pub use_tls: bool,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct Database {
   pub user: String,
   pub password: String,
@@ -59,13 +60,18 @@ pub struct Database {
   pub pool_size: u32,
 }
 
+#[derive(Debug, Deserialize)]
+pub struct Federation {
+  pub enabled: bool,
+  pub followed_instances: String,
+  pub tls_enabled: bool,
+}
+
 lazy_static! {
-  static ref SETTINGS: Settings = {
-    match Settings::init() {
-      Ok(c) => c,
-      Err(e) => panic!("{}", e),
-    }
-  };
+  static ref SETTINGS: RwLock<Settings> = RwLock::new(match Settings::init() {
+    Ok(c) => c,
+    Err(e) => panic!("{}", e),
+  });
 }
 
 impl Settings {
@@ -91,8 +97,8 @@ impl Settings {
   }
 
   /// Returns the config as a struct.
-  pub fn get() -> &'static Self {
-    &SETTINGS
+  pub fn get() -> Self {
+    SETTINGS.read().unwrap().to_owned()
   }
 
   /// Returns the postgres connection url. If LEMMY_DATABASE_URL is set, that is used,
@@ -121,7 +127,15 @@ impl Settings {
 
   pub fn save_config_file(data: &str) -> Result<String, Error> {
     fs::write(CONFIG_FILE, data)?;
-    Self::init()?;
+
+    // Reload the new settings
+    // From https://stackoverflow.com/questions/29654927/how-do-i-assign-a-string-to-a-mutable-static-variable/47181804#47181804
+    let mut new_settings = SETTINGS.write().unwrap();
+    *new_settings = match Settings::init() {
+      Ok(c) => c,
+      Err(e) => panic!("{}", e),
+    };
+
     Self::read_config_file()
   }
 }