Skip to content
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
12 changes: 12 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ rocksdb = "0.21"
serde = { version = "1.0.189", features = ["derive"] }
serde_json = { version = "1.0.107", features = ["std"] }
state-reconstruct-fetcher = { path = "./state-reconstruct-fetcher" }
syslog-tracing = "0.2.0"
thiserror = "1.0.50"
tikv-jemallocator = "0.5"
tokio = { version = "1.33.0", features = ["macros"] }
Expand Down
3 changes: 3 additions & 0 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ pub enum Command {
#[derive(Parser)]
#[command(author, version, about = "zkSync state reconstruction tool")]
pub struct Cli {
#[arg(long, default_value_t = false)]
pub with_syslog: bool,

#[command(subcommand)]
pub subcommand: Command,
}
46 changes: 29 additions & 17 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ mod util;

use std::{
env,
ffi::CStr,
fs::File,
io::BufReader,
path::{Path, PathBuf},
Expand All @@ -18,10 +19,11 @@ use eyre::Result;
use processor::snapshot::{
exporter::SnapshotExporter, importer::SnapshotImporter, SnapshotBuilder,
};
use syslog_tracing::Syslog;
use state_reconstruct_fetcher::{constants::storage, l1_fetcher::L1Fetcher, types::CommitBlock};
use tikv_jemallocator::Jemalloc;
use tokio::sync::mpsc;
use tracing_subscriber::{filter::LevelFilter, EnvFilter};
use tracing_subscriber::{filter::LevelFilter, prelude::*, registry::Registry, EnvFilter};

use crate::{
processor::{
Expand All @@ -35,30 +37,40 @@ use crate::{
#[global_allocator]
static GLOBAL: Jemalloc = Jemalloc;

fn start_logger(default_level: LevelFilter) {
fn start_logger(default_level: LevelFilter, with_syslog: bool) {
let filter = match EnvFilter::try_from_default_env() {
Ok(filter) => filter
.add_directive("hyper=off".parse().unwrap())
.add_directive("ethers=off".parse().unwrap()),
_ => EnvFilter::default()
.add_directive(default_level.into())
.add_directive("hyper=off".parse().unwrap())
.add_directive("ethers=off".parse().unwrap())
.add_directive("zksync_storage=off".parse().unwrap()),
Ok(filter) => filter,
_ => EnvFilter::default().add_directive(default_level.into()),
};

tracing_subscriber::fmt()
.with_env_filter(filter)
.with_target(false)
.init();
let filter = filter
.add_directive("hyper=off".parse().unwrap())
.add_directive("ethers=off".parse().unwrap());

let default_layer = tracing_subscriber::fmt::layer().with_target(false);

let subscriber = Registry::default().with(filter).with(default_layer);

if with_syslog {
let identity = CStr::from_bytes_with_nul(b"zksync-sr\0").unwrap();
let (options, facility) = Default::default();
let syslog = Syslog::new(identity, options, facility).unwrap();
let syslog_layer = tracing_subscriber::fmt::layer()
.with_target(false)
.with_ansi(false)
.without_time() // Syslog logs its own time.
.with_writer(syslog);

subscriber.with(syslog_layer).init();
} else {
subscriber.init();
}
}

#[tokio::main]
#[allow(clippy::too_many_lines)]
async fn main() -> Result<()> {
start_logger(LevelFilter::INFO);

let cli = Cli::parse();
start_logger(LevelFilter::INFO, cli.with_syslog);

match cli.subcommand {
Command::Reconstruct {
Expand Down