From 4747c6f17ed1edab4e1ada36ad19ede9e80b502d Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Tue, 3 Dec 2024 19:02:48 +0530 Subject: [PATCH] fix logger bug --- src/bin/directory-cli.rs | 4 +-- src/bin/directoryd.rs | 4 +-- src/bin/maker-cli.rs | 4 +-- src/bin/makerd.rs | 4 +-- src/bin/taker.rs | 4 +-- src/utill.rs | 63 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 73 insertions(+), 10 deletions(-) diff --git a/src/bin/directory-cli.rs b/src/bin/directory-cli.rs index a0a905fa..c2bcd829 100644 --- a/src/bin/directory-cli.rs +++ b/src/bin/directory-cli.rs @@ -8,7 +8,7 @@ use coinswap::{ directory::DirectoryServerError, rpc::{RpcMsgReq, RpcMsgResp}, }, - utill::{read_message, send_message, setup_logger}, + utill::{read_message, send_message, setup_directory_logger}, }; /// directory-cli is a command line app to send RPC messages to directory server. @@ -41,7 +41,7 @@ fn send_rpc_req(req: &RpcMsgReq) -> Result<(), DirectoryServerError> { } fn main() -> Result<(), DirectoryServerError> { - setup_logger(log::LevelFilter::Info); + setup_directory_logger(log::LevelFilter::Info); let cli = App::parse(); match cli.command { diff --git a/src/bin/directoryd.rs b/src/bin/directoryd.rs index cca5180a..e81422a8 100644 --- a/src/bin/directoryd.rs +++ b/src/bin/directoryd.rs @@ -2,7 +2,7 @@ use clap::Parser; use coinswap::{ market::directory::{start_directory_server, DirectoryServer, DirectoryServerError}, tor::setup_mitosis, - utill::{setup_logger, ConnectionType}, + utill::{setup_directory_logger, ConnectionType}, }; use std::{path::PathBuf, str::FromStr, sync::Arc}; @@ -19,7 +19,7 @@ struct Cli { } fn main() -> Result<(), DirectoryServerError> { - setup_logger(log::LevelFilter::Info); + setup_directory_logger(log::LevelFilter::Info); let args = Cli::parse(); diff --git a/src/bin/maker-cli.rs b/src/bin/maker-cli.rs index c5f4a51b..458328c0 100644 --- a/src/bin/maker-cli.rs +++ b/src/bin/maker-cli.rs @@ -3,7 +3,7 @@ use std::{net::TcpStream, time::Duration}; use clap::Parser; use coinswap::{ maker::{MakerError, RpcMsgReq, RpcMsgResp}, - utill::{read_message, send_message, setup_logger}, + utill::{read_message, send_message, setup_maker_logger}, }; /// maker-cli is a command line app to send RPC messages to maker server. @@ -50,7 +50,7 @@ enum Commands { } fn main() -> Result<(), MakerError> { - setup_logger(log::LevelFilter::Info); + setup_maker_logger(log::LevelFilter::Info); let cli = App::parse(); match cli.command { diff --git a/src/bin/makerd.rs b/src/bin/makerd.rs index 262b0c66..89c1aa8c 100644 --- a/src/bin/makerd.rs +++ b/src/bin/makerd.rs @@ -3,7 +3,7 @@ use clap::Parser; use coinswap::{ maker::{start_maker_server, Maker, MakerBehavior, MakerError}, tor::setup_mitosis, - utill::{parse_proxy_auth, setup_logger, ConnectionType}, + utill::{parse_proxy_auth, setup_maker_logger, ConnectionType}, wallet::RPCConfig, }; use std::{path::PathBuf, str::FromStr, sync::Arc}; @@ -52,7 +52,7 @@ struct Cli { } fn main() -> Result<(), MakerError> { - setup_logger(log::LevelFilter::Info); + setup_maker_logger(log::LevelFilter::Info); let args = Cli::parse(); diff --git a/src/bin/taker.rs b/src/bin/taker.rs index c1680096..16f027b8 100644 --- a/src/bin/taker.rs +++ b/src/bin/taker.rs @@ -3,7 +3,7 @@ use bitcoind::bitcoincore_rpc::{json::ListUnspentResultEntry, Auth}; use clap::Parser; use coinswap::{ taker::{error::TakerError, SwapParams, Taker, TakerBehavior}, - utill::{parse_proxy_auth, setup_logger, ConnectionType}, + utill::{parse_proxy_auth, setup_taker_logger, ConnectionType}, wallet::{Destination, RPCConfig, SendAmount}, }; use log::LevelFilter; @@ -143,7 +143,7 @@ fn main() -> Result<(), TakerError> { }, }; - setup_logger(log_level); + setup_taker_logger(log_level); match args.command { Commands::SeedUtxo => { diff --git a/src/utill.rs b/src/utill.rs index b8e7d98c..2f4f20dd 100644 --- a/src/utill.rs +++ b/src/utill.rs @@ -119,6 +119,69 @@ pub fn seed_phrase_to_unique_id(seed: &str) -> String { hash } +pub fn setup_taker_logger(filter: LevelFilter) { + env::set_var("RUST_LOG", "coinswap=info"); + let log_dir = get_taker_dir().join("debug.log"); + + let stdout = ConsoleAppender::builder().build(); + let file_appender = FileAppender::builder().build(log_dir).unwrap(); + + let config = Config::builder() + .appender(Appender::builder().build("stdout", Box::new(stdout))) + .appender(Appender::builder().build("file", Box::new(file_appender))) + .logger( + Logger::builder() + .appender("file") + .build("coinswap::taker", filter), + ) + .build(Root::builder().appender("stdout").build(filter)) + .unwrap(); + + log4rs::init_config(config).unwrap(); +} + +pub fn setup_maker_logger(filter: LevelFilter) { + env::set_var("RUST_LOG", "coinswap=info"); + let log_dir = get_maker_dir().join("debug.log"); + + let stdout = ConsoleAppender::builder().build(); + let file_appender = FileAppender::builder().build(log_dir).unwrap(); + + let config = Config::builder() + .appender(Appender::builder().build("stdout", Box::new(stdout))) + .appender(Appender::builder().build("file", Box::new(file_appender))) + .logger( + Logger::builder() + .appender("file") + .build("coinswap::maker", filter), + ) + .build(Root::builder().appender("stdout").build(filter)) + .unwrap(); + + log4rs::init_config(config).unwrap(); +} + +pub fn setup_directory_logger(filter: LevelFilter) { + env::set_var("RUST_LOG", "coinswap=info"); + let log_dir = get_dns_dir().join("debug.log"); + + let stdout = ConsoleAppender::builder().build(); + let file_appender = FileAppender::builder().build(log_dir).unwrap(); + + let config = Config::builder() + .appender(Appender::builder().build("stdout", Box::new(stdout))) + .appender(Appender::builder().build("file", Box::new(file_appender))) + .logger( + Logger::builder() + .appender("file") + .build("coinswap::market", filter), + ) + .build(Root::builder().appender("stdout").build(filter)) + .unwrap(); + + log4rs::init_config(config).unwrap(); +} + /// Setup function that will only run once, even if called multiple times. /// Takes log level to set the desired logging verbosity pub fn setup_logger(filter: LevelFilter) {