From 0c96cf5840d5c617f95181ff4d9b1e41c1397d1e Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Sat, 25 Sep 2021 23:20:33 +0800 Subject: [PATCH] log BUILD_TIME and bump version to v1.12.0-alpha.5 --- Cargo.lock | 48 ++++++++++++++++++++++++++++++----------------- Cargo.toml | 3 ++- bin/common/mod.rs | 3 +++ bin/sslocal.rs | 2 +- bin/ssmanager.rs | 2 +- bin/ssserver.rs | 2 +- 6 files changed, 39 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dd07491269d5..d4e8f7f37457 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,6 +122,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" +[[package]] +name = "build-time" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1903cc3455e5cc187bd0e2cacad7de3b3fd8352b71c538039c3813bc713b2a40" +dependencies = [ + "chrono", + "once_cell", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "bumpalo" version = "3.7.1" @@ -566,9 +579,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ "bytes", "fnv", @@ -651,9 +664,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b031475cb1b103ee221afb806a23d35e0570bf7271d7588762ceba8127ed43b3" +checksum = "d88ed757e516714cd8736e65b84ed901f72458512111871f20c1d377abdfbf5e" dependencies = [ "bitflags", "inotify-sys", @@ -671,9 +684,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd" dependencies = [ "cfg-if", ] @@ -749,9 +762,9 @@ dependencies = [ [[package]] name = "json5" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42c5b03e1c17d4a0d2515f5b47be5d408be4504ebb9a2f669790fb3a20cbed0" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" dependencies = [ "pest", "pest_derive", @@ -1057,9 +1070,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.66" +version = "0.9.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" +checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" dependencies = [ "autocfg", "cc", @@ -1579,8 +1592,9 @@ dependencies = [ [[package]] name = "shadowsocks-rust" -version = "1.12.0-alpha.4" +version = "1.12.0-alpha.5" dependencies = [ + "build-time", "byte_string", "byteorder", "cfg-if", @@ -1736,9 +1750,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.76" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +checksum = "5239bc68e0fef57495900cfea4e8dc75596d9a319d7e16b1e0a440d24e6fe0a0" dependencies = [ "proc-macro2", "quote", @@ -1846,9 +1860,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5241dd6f21443a3606b432718b166d3cedc962fd4b8bea54a8bc7f514ebda986" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -1861,9 +1875,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" +checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" dependencies = [ "autocfg", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 3315c976419b..cd4b69c497d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks-rust" -version = "1.12.0-alpha.4" +version = "1.12.0-alpha.5" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" @@ -124,6 +124,7 @@ clap = { version = "2", features = ["wrap_help", "suggestions"] } cfg-if = "1" qrcode = { version = "0.12", default-features = false } exitcode = "1" +build-time = "0.1" futures = "0.3" tokio = { version = "1", features = ["rt", "signal"] } diff --git a/bin/common/mod.rs b/bin/common/mod.rs index 51d2dc8a54cd..bece21d79d8d 100644 --- a/bin/common/mod.rs +++ b/bin/common/mod.rs @@ -12,3 +12,6 @@ pub const EXIT_CODE_SERVER_EXIT_UNEXPECTLY: i32 = exitcode::SOFTWARE; pub const EXIT_CODE_SERVER_ABORTED: i32 = exitcode::SOFTWARE; pub const EXIT_CODE_LOAD_CONFIG_FAILURE: i32 = exitcode::CONFIG; pub const EXIT_CODE_LOAD_ACL_FAILURE: i32 = exitcode::CONFIG; + +#[allow(dead_code)] +pub const BUILD_TIME: &str = build_time::build_time_utc!(); diff --git a/bin/sslocal.rs b/bin/sslocal.rs index 4958e129bfc2..eeae2ecd4d35 100644 --- a/bin/sslocal.rs +++ b/bin/sslocal.rs @@ -502,7 +502,7 @@ fn main() { daemonize::daemonize(matches.value_of("DAEMONIZE_PID_PATH")); } - info!("shadowsocks {}", VERSION); + info!("shadowsocks local {} build {}", VERSION, common::BUILD_TIME); #[cfg(feature = "multi-threaded")] let mut builder = if matches.is_present("SINGLE_THREADED") { diff --git a/bin/ssmanager.rs b/bin/ssmanager.rs index 15091c96a45a..0b671bc24b46 100644 --- a/bin/ssmanager.rs +++ b/bin/ssmanager.rs @@ -293,7 +293,7 @@ fn main() { daemonize::daemonize(matches.value_of("DAEMONIZE_PID_PATH")); } - info!("shadowsocks {}", VERSION); + info!("shadowsocks manager {} build {}", VERSION, common::BUILD_TIME); #[cfg(feature = "multi-threaded")] let mut builder = if matches.is_present("SINGLE_THREADED") { diff --git a/bin/ssserver.rs b/bin/ssserver.rs index 7be2fb12b61d..d350aa75b121 100644 --- a/bin/ssserver.rs +++ b/bin/ssserver.rs @@ -292,7 +292,7 @@ fn main() { daemonize::daemonize(matches.value_of("DAEMONIZE_PID_PATH")); } - info!("shadowsocks {}", VERSION); + info!("shadowsocks server {} build {}", VERSION, common::BUILD_TIME); #[cfg(feature = "multi-threaded")] let mut builder = if matches.is_present("SINGLE_THREADED") {