checkpoint

veilid-server/src/client_api.rs

@@ -167,20 +167,20 @@ impl ClientApi {
         if args.len() == 0 {
             apibail_generic!("no control request specified");
         }
-        if args[0] == "shutdown" {
+        if args[0] == "Shutdown" {
             if args.len() != 1 {
                 apibail_generic!("wrong number of arguments");
             }
             self.shutdown();
             Ok("".to_owned())
-        } else if args[0] == "change_log_level" {
+        } else if args[0] == "ChangeLogLevel" {
             if args.len() != 3 {
                 apibail_generic!("wrong number of arguments");
             }
             let log_level: VeilidConfigLogLevel = deserialize_json(&args[2])?;
             self.change_log_level(args[1].clone(), log_level)?;
             Ok("".to_owned())
-        } else if args[0] == "get_server_settings" {
+        } else if args[0] == "GetServerSettings" {
             if args.len() != 1 {
                 apibail_generic!("wrong number of arguments");
             }
@@ -194,7 +194,7 @@ impl ClientApi {
             settings_json["core"]["protected_store"].remove("new_device_encryption_key_password");
             let safe_settings_json = settings_json.to_string();
             Ok(safe_settings_json)
-        } else if args[0] == "emit_schema" {
+        } else if args[0] == "EmitSchema" {
             if args.len() != 2 {
                 apibail_generic!("wrong number of arguments");
             }

veilid-server/src/main.rs

@@ -14,14 +14,10 @@ mod veilid_logs;
 #[cfg(windows)]
 mod windows;
 
-use cfg_if::*;
-#[allow(unused_imports)]
-use color_eyre::eyre::{bail, ensure, eyre, Result as EyreResult, WrapErr};
 use server::*;
 use std::collections::HashMap;
 use std::str::FromStr;
 use tools::*;
-use tracing::*;
 use veilid_logs::*;
 
 #[instrument(err)]

veilid-server/src/server.rs

@@ -1,5 +1,6 @@
 use crate::client_api;
 use crate::settings::*;
+use crate::tools::*;
 use crate::veilid_logs::*;
 use flume::{unbounded, Receiver, Sender};
 use futures_util::select;

veilid-server/src/settings.rs

@@ -2,6 +2,7 @@
 
 use directories::*;
 
+use crate::tools::*;
 use serde_derive::*;
 use std::ffi::OsStr;
 use std::net::SocketAddr;

veilid-server/src/tools.rs

@@ -1,5 +1,8 @@
-use cfg_if::*;
-use core::future::Future;
+pub use cfg_if::*;
+pub use color_eyre::eyre::{bail, ensure, eyre, Result as EyreResult, WrapErr};
+pub use core::future::Future;
+pub use parking_lot::*;
+pub use tracing::*;
 
 cfg_if! {
     if #[cfg(feature="rt-async-std")] {