diff --git a/service/src/main.rs b/service/src/main.rs index 30aaf2cbd..dbb359e97 100644 --- a/service/src/main.rs +++ b/service/src/main.rs @@ -4,13 +4,32 @@ use std::process::ExitCode; use indexer_service_rs::service::run; +use tracing::level_filters::LevelFilter; +use tracing::subscriber::set_global_default; +use tracing_subscriber::{EnvFilter, FmtSubscriber}; #[tokio::main] async fn main() -> ExitCode { - tracing_subscriber::fmt::init(); + init_tracing(); if let Err(e) = run().await { tracing::error!("Indexer service error: {e}"); return ExitCode::from(1); } ExitCode::SUCCESS } + +fn init_tracing() { + // Tracing setup + let filter = EnvFilter::builder() + .with_default_directive(LevelFilter::INFO.into()) + .from_env_lossy(); + let subscriber_builder: tracing_subscriber::fmt::SubscriberBuilder< + tracing_subscriber::fmt::format::DefaultFields, + tracing_subscriber::fmt::format::Format, + EnvFilter, + > = FmtSubscriber::builder().with_env_filter(filter); + set_global_default(subscriber_builder.with_ansi(true).pretty().finish()).expect( + "Could not set up global default subscriber for logger, check \ + environmental variable `RUST_LOG`", + ); +} diff --git a/tap-agent/src/config.rs b/tap-agent/src/config.rs index 51a549a6e..48371fe14 100644 --- a/tap-agent/src/config.rs +++ b/tap-agent/src/config.rs @@ -1,16 +1,15 @@ // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs. // SPDX-License-Identifier: Apache-2.0 +use anyhow::Result; use clap::Parser; use indexer_config::{Config as IndexerConfig, ConfigPrefix}; use reqwest::Url; use std::path::PathBuf; use std::{collections::HashMap, str::FromStr}; -use tracing::error; - -use anyhow::Result; use thegraph_core::{Address, DeploymentId}; use tracing::subscriber::{set_global_default, SetGlobalDefaultError}; +use tracing::{error, level_filters::LevelFilter}; use tracing_subscriber::{EnvFilter, FmtSubscriber}; #[derive(Parser)] @@ -165,7 +164,9 @@ pub struct Tap { /// Sets up tracing, allows log level to be set from the environment variables fn init_tracing(format: String) -> Result<(), SetGlobalDefaultError> { - let filter = EnvFilter::from_default_env(); + let filter = EnvFilter::builder() + .with_default_directive(LevelFilter::INFO.into()) + .from_env_lossy(); let subscriber_builder: tracing_subscriber::fmt::SubscriberBuilder< tracing_subscriber::fmt::format::DefaultFields, tracing_subscriber::fmt::format::Format,