Skip to content

Commit

Permalink
Updates (#223)
Browse files Browse the repository at this point in the history
* bump tokio version

* color in logging output

* bump router version

* Move logging to SDR-E Rust Logging common lib
  • Loading branch information
fredclausen authored May 28, 2023
1 parent 7f69a77 commit a0de755
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 80 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
members = [
"rust/bin/acars_router",
"rust/libraries/acars_config",
"rust/libraries/acars_logging",
"rust/libraries/acars_connection_manager",
]

[workspace.package]
edition = "2021"
version = "1.0.17"
version = "1.0.18"
authors = ["Fred Clausen", "Mike Nye", "Alex Austin"]
description = "ACARS Router: A Utility to ingest ACARS/VDLM2 from many sources, process, and feed out to many consumers."
documentation = "https://github.com/sdr-enthusiasts/acars_router"
Expand Down
4 changes: 2 additions & 2 deletions rust/bin/acars_router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ rust-version.workspace = true

[dependencies]
log = "0.4.17"
tokio = { version = "1.28.1", features = ["full", "tracing"] }
tokio = { version = "1.28.2", features = ["full", "tracing"] }
chrono = "0.4.24"
serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96"
failure = "0.1.8"
acars_config = { path = "../../libraries/acars_config" }
acars_logging = { path = "../../libraries/acars_logging" }
sdre-rust-logging = { git = "https://github.com/sdr-enthusiasts/sdre-rust-logging.git" }
acars_connection_manager = { path = "../../libraries/acars_connection_manager" }
4 changes: 2 additions & 2 deletions rust/bin/acars_router/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
extern crate log;
extern crate acars_config;
extern crate acars_connection_manager;
extern crate acars_logging;
extern crate chrono;
extern crate failure;
extern crate sdre_rust_logging;
extern crate serde;
extern crate serde_json;

use acars_config::clap::Parser;
use acars_config::Input;
use acars_connection_manager::service_init::start_processes;
use acars_logging::SetupLogging;
use sdre_rust_logging::SetupLogging;
use std::error::Error;
use std::process;

Expand Down
2 changes: 1 addition & 1 deletion rust/libraries/acars_config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ edition.workspace = true
[dependencies]
clap = { version = "4.3.0", features = ["derive", "env"] }
log = "0.4.17"
acars_logging = { path = "../acars_logging" }
sdre-rust-logging = { git = "https://github.com/sdr-enthusiasts/sdre-rust-logging.git" }
4 changes: 2 additions & 2 deletions rust/libraries/acars_config/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
pub extern crate clap as clap;
#[macro_use]
extern crate log;
extern crate acars_logging;
extern crate sdre_rust_logging;

pub mod sanity_checker;

use acars_logging::SetupLogging;
use clap::Parser;
use sdre_rust_logging::SetupLogging;

#[derive(Parser, Debug, Clone, Default)]
#[command(name = "ACARS Router", author, version, about, long_about = None)]
Expand Down
2 changes: 1 addition & 1 deletion rust/libraries/acars_connection_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition.workspace = true
[dependencies]
stubborn-io = "0.3.2"
log = "0.4.17"
tokio = { version = "1.28.1", features = ["full", "tracing"] }
tokio = { version = "1.28.2", features = ["full", "tracing"] }
tokio-util = { version = "0.7.8", features = ["full"] }
tokio-stream = "0.1.14"
futures = "0.3.28"
Expand Down
11 changes: 0 additions & 11 deletions rust/libraries/acars_logging/Cargo.toml

This file was deleted.

59 changes: 0 additions & 59 deletions rust/libraries/acars_logging/src/lib.rs

This file was deleted.

0 comments on commit a0de755

Please sign in to comment.