Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:logs to file based on settings #120

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,11 @@ $ mecha-agent whoami
### Reset
```bash
$ mecha-agent reset
```
```

To write logs in file we have to configure settings in settings.yml
```sh
logging:
enabled: true
path: /var/log/mecha-agent.log # File path to store logs based on level filter
level: info
1 change: 1 addition & 0 deletions agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ prost-types = { workspace = true }
bincode = { workspace = true }
opentelemetry-appender-tracing = { workspace = true }
clap = { workspace = true }
tracing-appender = "0.2.3"

[build-dependencies]
tonic-build = "0.10.2"
Expand Down
37 changes: 34 additions & 3 deletions agent/src/bin/agent.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
use std::net::{IpAddr, SocketAddr};
use std::{
ffi::OsStr,
net::{IpAddr, SocketAddr},
path::Path,
};

use agent_settings::{read_settings_yml, GrpcSettings};
use agent_settings::{constants, read_settings_yml, GrpcSettings};
use anyhow::{bail, Result};
use clap::Parser;
use init_tracing_opentelemetry::tracing_subscriber_ext::{
Expand All @@ -12,7 +16,8 @@ use mecha_agent::init::init_handlers;
use opentelemetry::global;
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
use telemetry::config::init_logs_config;
use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;
use tracing_appender::{non_blocking, rolling};
use tracing_subscriber::{fmt::Layer, prelude::__tracing_subscriber_SubscriberExt};
const PACKAGE_NAME: &str = env!("CARGO_PKG_NAME");

#[derive(Debug, Parser)]
Expand Down Expand Up @@ -81,11 +86,37 @@ async fn start_agent(settings_path: String, init_grpc: bool) -> Result<()> {
let socket_addr = get_exporter_endpoint(&settings.grpc);
let endpoint = format!("http://{}", socket_addr);
let _ = init_logs_config(endpoint.as_str());
let path = Path::new(settings.logging.path.as_str());

//trying to separate a dir and file
let directory = match path.parent() {
Some(p) => p,
None => Path::new(constants::DEFAULT_LOG_FILE_DIR),
};
let file_name = match path.file_name() {
Some(f) => f,
None => OsStr::new(constants::DEFAULT_LOG_FILE_NAME),
};

let file_appender = rolling::never(directory, file_name);
let (non_blocking_writer, _guard) = non_blocking(file_appender);
// Set optional layer for logging to a file
let logs_to_file_layer = if settings.logging.enabled && !settings.logging.path.is_empty() {
Some(
Layer::new()
.with_writer(non_blocking_writer)
.with_ansi(false),
)
} else {
None
};

let logger_provider = opentelemetry::global::logger_provider();
let tracing_bridge_layer = OpenTelemetryTracingBridge::new(&logger_provider);
global::set_logger_provider(logger_provider);

let subscriber = tracing_subscriber::registry()
.with(logs_to_file_layer)
.with(tracing_bridge_layer)
.with(build_loglevel_filter_layer()) //temp for terminal log
.with(build_logger_text()) //temp for terminal log
Expand Down
2 changes: 2 additions & 0 deletions core/settings/src/constants.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
pub const DEFAULT_LOG_FILE_NAME: &str = "mecha-agent.log";
pub const DEFAULT_LOG_FILE_DIR: &str = "~/.local/logs";
pub const PRIVATE_KEY_PATH: &str = "/openssl/ecdsa/key.pem";
pub const CSR_PATH: &str = "/openssl/ecdsa/csr.pem";
pub const CERT_PATH: &str = "/agent/certs/machine.pem";
Expand Down