chiark / gitweb /
provide debug in config
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 26 Aug 2020 22:17:44 +0000 (23:17 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 26 Aug 2020 22:17:44 +0000 (23:17 +0100)
src/global.rs

index 7b91ccedeb4036f93fe1dbe1fe07f95926da1551..6ff4af20924cf6719a9143b0fdd9c26399a59086 100644 (file)
@@ -929,12 +929,14 @@ const DEFAULT_COMMAND_SOCKET : &str = "command.socket"; // in save dir
 pub struct ServerConfigSpec {
   pub save_directory: Option<String>,
   pub command_socket: Option<String>,
+  pub debug: Option<bool>,
 }
 
 #[derive(Debug,Clone)]
 pub struct ServerConfig {
   pub save_directory: String,
   pub command_socket: String,
+  pub debug: bool,
 }
 
 impl TryFrom<ServerConfigSpec> for ServerConfig {
@@ -942,7 +944,7 @@ impl TryFrom<ServerConfigSpec> for ServerConfig {
   #[throws(Self::Error)]
   fn try_from(spec: ServerConfigSpec) -> ServerConfig {
     let ServerConfigSpec {
-      save_directory, command_socket,
+      save_directory, command_socket, debug,
     } = spec;
 
     let save_directory = save_directory
@@ -954,8 +956,10 @@ impl TryFrom<ServerConfigSpec> for ServerConfig {
       command_socket = format!("{}/{}", save_directory, command_socket);
     }
 
+    let debug = debug.unwrap_or(cfg!(debug_assertions));
+
     ServerConfig {
-      save_directory, command_socket,
+      save_directory, command_socket, debug,
     }
   }
 }