Skip to content

R
railgun-routing-server
Commit 77d4d359 authored by nanamicat's avatar nanamicat
Browse files
Options

log

parent cdae44ba
Pipeline #42132 passed with stages
        in 4 minutes and 41 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 92 additions and 10 deletions
        Cargo.lock
        View file @ 77d4d359
        ...@@ -450,6 +450,12 @@ dependencies = [ ...@@ -450,6 +450,12 @@ dependencies = [
        "serde", "serde",
        ] ]
        [[package]]
        name = "lazy_static"
        version = "1.5.0"
        source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
        [[package]] [[package]]
        name = "libc" name = "libc"
        version = "0.2.178" version = "0.2.178"
        ...@@ -500,6 +506,15 @@ dependencies = [ ...@@ -500,6 +506,15 @@ dependencies = [
        "windows-sys 0.61.2", "windows-sys 0.61.2",
        ] ]
        [[package]]
        name = "nu-ansi-term"
        version = "0.50.3"
        source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
        dependencies = [
        "windows-sys 0.61.2",
        ]
        [[package]] [[package]]
        name = "once_cell" name = "once_cell"
        version = "1.21.3" version = "1.21.3"
        ...@@ -636,6 +651,8 @@ dependencies = [ ...@@ -636,6 +651,8 @@ dependencies = [
        "serde_json", "serde_json",
        "tokio", "tokio",
        "tower-http", "tower-http",
        "tracing",
        "tracing-subscriber",
        ] ]
        [[package]] [[package]]
        ...@@ -781,6 +798,15 @@ dependencies = [ ...@@ -781,6 +798,15 @@ dependencies = [
        "digest", "digest",
        ] ]
        [[package]]
        name = "sharded-slab"
        version = "0.1.7"
        source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
        dependencies = [
        "lazy_static",
        ]
        [[package]] [[package]]
        name = "signal-hook-registry" name = "signal-hook-registry"
        version = "1.4.7" version = "1.4.7"
        ...@@ -823,6 +849,15 @@ version = "1.0.2" ...@@ -823,6 +849,15 @@ version = "1.0.2"
        source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
        [[package]]
        name = "thread_local"
        version = "1.1.9"
        source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
        dependencies = [
        "cfg-if",
        ]
        [[package]] [[package]]
        name = "tiny-keccak" name = "tiny-keccak"
        version = "2.0.2" version = "2.0.2"
        ...@@ -935,22 +970,60 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" ...@@ -935,22 +970,60 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
        [[package]] [[package]]
        name = "tracing" name = "tracing"
        version = "0.1.43" version = "0.1.44"
        source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
        dependencies = [ dependencies = [
        "log", "log",
        "pin-project-lite", "pin-project-lite",
        "tracing-attributes",
        "tracing-core", "tracing-core",
        ] ]
        [[package]]
        name = "tracing-attributes"
        version = "0.1.31"
        source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
        dependencies = [
        "proc-macro2",
        "quote",
        "syn",
        ]
        [[package]] [[package]]
        name = "tracing-core" name = "tracing-core"
        version = "0.1.35" version = "0.1.36"
        source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
        dependencies = [
        "once_cell",
        "valuable",
        ]
        [[package]]
        name = "tracing-log"
        version = "0.2.0"
        source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
        dependencies = [ dependencies = [
        "log",
        "once_cell", "once_cell",
        "tracing-core",
        ]
        [[package]]
        name = "tracing-subscriber"
        version = "0.3.22"
        source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
        dependencies = [
        "nu-ansi-term",
        "sharded-slab",
        "smallvec",
        "thread_local",
        "tracing-core",
        "tracing-log",
        ] ]
        [[package]] [[package]]
        ...@@ -989,6 +1062,12 @@ version = "0.0.4" ...@@ -989,6 +1062,12 @@ version = "0.0.4"
        source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
        [[package]]
        name = "valuable"
        version = "0.1.1"
        source = "registry+https://github.com/rust-lang/crates.io-index"
        checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
        [[package]] [[package]]
        name = "version_check" name = "version_check"
        version = "0.9.5" version = "0.9.5"
        ......
        Cargo.toml
        View file @ 77d4d359
        ...@@ -14,3 +14,5 @@ anyhow = "1.0.100" ...@@ -14,3 +14,5 @@ anyhow = "1.0.100"
        axum = { version = "0.8.7", features = ["macros"] } axum = { version = "0.8.7", features = ["macros"] }
        bincode = "2.0.1" bincode = "2.0.1"
        tower-http = { version = "0.6.8", features = ["cors"] } tower-http = { version = "0.6.8", features = ["cors"] }
        tracing = "0.1.44"
        tracing-subscriber = "0.3.22"
        src/main.rs
        View file @ 77d4d359
        ...@@ -2,9 +2,9 @@ use crate::api::create_app; ...@@ -2,9 +2,9 @@ use crate::api::create_app;
        use crate::data::{ConnectionData, RouterData}; use crate::data::{ConnectionData, RouterData};
        use crate::protocol::{Change, Report}; use crate::protocol::{Change, Report};
        use crate::router::Router; use crate::router::Router;
        use crate::settings::{Settings, INTERVAL, TIMEOUT}; use crate::settings::{INTERVAL, Settings, TIMEOUT};
        use anyhow::Result;
        use ::config::Config; use ::config::Config;
        use anyhow::Result;
        use config::Environment; use config::Environment;
        use net::SocketAddr; use net::SocketAddr;
        use serde::Serialize; use serde::Serialize;
        ...@@ -33,6 +33,7 @@ pub struct UpdatingState { ...@@ -33,6 +33,7 @@ pub struct UpdatingState {
        #[tokio::main] #[tokio::main]
        async fn main() -> Result<()> { async fn main() -> Result<()> {
        tracing_subscriber::fmt::init();
        let config: Settings = Config::builder().add_source(Environment::default()).build()?.try_deserialize()?; let config: Settings = Config::builder().add_source(Environment::default()).build()?.try_deserialize()?;
        let routers_data: Arc<Vec<RouterData>> = Arc::new(serde_json::from_str(&std::fs::read_to_string("import/data/Router.json")?)?); let routers_data: Arc<Vec<RouterData>> = Arc::new(serde_json::from_str(&std::fs::read_to_string("import/data/Router.json")?)?);
        ......
        src/router.rs
        View file @ 77d4d359
        use crate::UpdatingState;
        use crate::data::{ConnectionData, RouterData}; use crate::data::{ConnectionData, RouterData};
        use crate::protocol::{Change, PeerQuality, Report}; use crate::protocol::{Change, PeerQuality, Report};
        use crate::quality::Quality; use crate::quality::Quality;
        use crate::settings::THROTTLE; use crate::settings::THROTTLE;
        use crate::UpdatingState;
        use serde::Serialize; use serde::Serialize;
        use std::collections::BTreeMap; use std::collections::BTreeMap;
        use std::net::SocketAddr; use std::net::SocketAddr;
        ...@@ -63,7 +63,7 @@ impl Router { ...@@ -63,7 +63,7 @@ impl Router {
        pub fn offline(&mut self) { pub fn offline(&mut self) {
        if self.addr != None { if self.addr != None {
        println!("router {} offline", self.id); tracing::info!("router {} offline", self.id);
        } }
        self.addr = None; self.addr = None;
        for peer in self.peers.values_mut() { for peer in self.peers.values_mut() {
        ...@@ -72,7 +72,7 @@ impl Router { ...@@ -72,7 +72,7 @@ impl Router {
        } }
        pub fn online(&mut self, addr: SocketAddr) { pub fn online(&mut self, addr: SocketAddr) {
        if self.addr == None { if self.addr == None {
        println!("router {} online", self.id); tracing::info!("router {} online", self.id);
        } }
        self.addr = Some(addr); self.addr = Some(addr);
        self.time = Instant::now(); self.time = Instant::now();
        ...@@ -95,7 +95,7 @@ impl Router { ...@@ -95,7 +95,7 @@ impl Router {
        for (current, new) in self.peers.values_mut().zip(data.peers) { for (current, new) in self.peers.values_mut().zip(data.peers) {
        *current = new *current = new
        } }
        if (updating.router_id == self.id) { if updating.router_id == self.id {
        self.via.append(&mut updating.change.via); self.via.append(&mut updating.change.via);
        self.finish(updating); self.finish(updating);
        } }
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment