diff --git a/config/directory_config.json b/config/directory_config.json index d03748053..c9dedf042 100644 --- a/config/directory_config.json +++ b/config/directory_config.json @@ -1,7 +1,7 @@ { "base_url": "http://localhost:8080", "default_org": { - "id": "350170397284499470", + "id": "350192628202995726", "name": "default", "domain": "default.localhost" }, @@ -13,8 +13,8 @@ "first_name": "Admin", "last_name": "User" }, - "admin_token": "K7-6eQSzh7Lgcb5vuWZGODO1nrIAu1gFv7KxFJoYPSn15NFT8E9-iNy6AFaEQEkE9mb0tK0", + "admin_token": "D2IMmmxhLcL_DJMUMbmXxMuebowhWz0m8jBBwyCjI80wWz8kMfW2XqSsoXydz3oluL9gcns", "project_id": "", - "client_id": "350170398056316942", - "client_secret": "ej5NkifamoHntY21FFvz18wygcgFFKtaLpwW4lN1XHwMHRGWb5GrzFxIeaA1iqZu" + "client_id": "350192628773486606", + "client_secret": "lMT0aQarbjRVBRtzFUlheVkqKZlbcVO8j58EHOu0gIl4W65BGJVEc6k7WxJ8v4wr" } \ No newline at end of file diff --git a/src/core/package_manager/cli.rs b/src/core/package_manager/cli.rs index ddf77caa2..abd9333ea 100644 --- a/src/core/package_manager/cli.rs +++ b/src/core/package_manager/cli.rs @@ -1,16 +1,18 @@ +use crate::package_manager::{get_all_components, InstallMode, PackageManager}; use anyhow::Result; use std::env; use std::process::Command; -use crate::package_manager::{get_all_components, InstallMode, PackageManager}; pub async fn run() -> Result<()> { - env_logger::init(); + // Logger is already initialized in main.rs, don't initialize again let args: Vec = env::args().collect(); if args.len() < 2 { print_usage(); return Ok(()); } -use tracing::info; -fn print_usage(){info!("usage: botserver [options]")} + use tracing::info; + fn print_usage() { + info!("usage: botserver [options]") + } let command = &args[1]; match command.as_str() { "start" => { @@ -41,7 +43,10 @@ fn print_usage(){info!("usage: botserver [options]")} println!("Stopping all components..."); let components = get_all_components(); for component in components { - let _ = Command::new("pkill").arg("-f").arg(component.termination_command).output(); + let _ = Command::new("pkill") + .arg("-f") + .arg(component.termination_command) + .output(); } println!("✓ BotServer components stopped"); } @@ -49,7 +54,10 @@ fn print_usage(){info!("usage: botserver [options]")} println!("Restarting BotServer..."); let components = get_all_components(); for component in components { - let _ = Command::new("pkill").arg("-f").arg(component.termination_command).output(); + let _ = Command::new("pkill") + .arg("-f") + .arg(component.termination_command) + .output(); } tokio::time::sleep(tokio::time::Duration::from_secs(2)).await; let mode = if args.contains(&"--container".to_string()) {