diff --git a/riklet/src/core.rs b/riklet/src/core.rs index 46ec739e..fa0ab475 100644 --- a/riklet/src/core.rs +++ b/riklet/src/core.rs @@ -15,7 +15,7 @@ use tracing_subscriber::field::debug; use thiserror::Error; use tonic::{transport::Channel, Request, Streaming}; -use tracing::{debug, error, event, Level}; +use tracing::{debug, error, event, info, Level}; const METRICS_UPDATER_INTERVAL: u64 = 15 * 1000; @@ -148,8 +148,8 @@ impl Riklet { } pub async fn run(&mut self) -> Result<()> { - event!(Level::INFO, "Riklet is running."); self.start_metrics_updater(); + info!("Riklet is running"); while let Some(workload) = self .stream diff --git a/riklet/src/main.rs b/riklet/src/main.rs index 37c5ad31..35d1a007 100644 --- a/riklet/src/main.rs +++ b/riklet/src/main.rs @@ -17,10 +17,8 @@ use tracing::error; #[tokio::main] async fn main() -> Result<()> { - init_logger(Some("debug".to_string()))?; + init_logger()?; - // run a function to test #[instrument] macro - // test_instrument(); // If the process doesn't have root privileges, exit and display error. if !nix::unistd::Uid::effective().is_root() { error!("Riklet must run with root privileges."); diff --git a/riklet/src/utils.rs b/riklet/src/utils.rs index 7b32d93b..45073378 100644 --- a/riklet/src/utils.rs +++ b/riklet/src/utils.rs @@ -1,5 +1,4 @@ use anyhow::Result; -use tracing_subscriber::{prelude::__tracing_subscriber_SubscriberExt, EnvFilter, Registry}; pub fn banner() { println!( @@ -14,19 +13,9 @@ pub fn banner() { ); } -pub fn init_logger(log_level: Option) -> Result<()> { - let logger = tracing_subscriber::fmt::layer().json(); - // Try to get the log level from the environment variable `RUST_LOG`. - // If the variable is not defined, then use the cli argument or the default value 'info' if neither is defined - let env_filter = EnvFilter::try_from_default_env() - .or_else(|_| { - let level = log_level.unwrap_or_else(|| "info".to_string()); - EnvFilter::try_new(level.as_str()) - })? - .add_directive("h2=OFF".parse().unwrap()); // disable all events from the `h2` crate; - - let collector = Registry::default().with(logger).with(env_filter); - tracing::subscriber::set_global_default(collector)?; - +pub fn init_logger() -> Result<()> { + let subscriber = tracing_subscriber::fmt().compact().finish(); + tracing::subscriber::set_global_default(subscriber) + .expect("Failed to initiate the logger subscriber"); Ok(()) } diff --git a/scheduler/src/main.rs b/scheduler/src/main.rs index fef077fc..09476b68 100644 --- a/scheduler/src/main.rs +++ b/scheduler/src/main.rs @@ -5,14 +5,14 @@ mod state_manager; use crate::config_parser::ConfigParser; use crate::grpc::GRPCService; use crate::state_manager::{StateManager, StateManagerEvent}; -use env_logger::Env; + use proto::common::worker_status::Status; use proto::common::{ResourceStatus, WorkerMetric as WorkerMetricProto, WorkerStatus}; use proto::controller::controller_server::ControllerServer; use proto::worker::worker_server::WorkerServer; use scheduler::Event; use scheduler::{Controller, SchedulerError, Worker, WorkerRegisterChannelType}; -use std::default::Default; + use std::net::{SocketAddr, SocketAddrV4}; use std::sync::Arc; use tracing::{debug, error, info, warn};