aboutsummaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorLibravatar Rutger Broekhoff2024-01-24 18:24:26 +0100
committerLibravatar Rutger Broekhoff2024-01-24 18:24:26 +0100
commit54035ca467789b6218008b3d94c4aa40214a3a35 (patch)
tree148a5ec872e867baefc5dbd34d63064be0e9325b /rs
parent399d340187171420b5f1fcf524906aadd04be5d6 (diff)
downloadgitolfs3-54035ca467789b6218008b3d94c4aa40214a3a35.tar.gz
gitolfs3-54035ca467789b6218008b3d94c4aa40214a3a35.zip
You wouldn't believe it, but it's time for another dependency
Diffstat (limited to 'rs')
-rw-r--r--rs/Cargo.lock60
-rw-r--r--rs/server/Cargo.toml1
-rw-r--r--rs/server/src/main.rs1
3 files changed, 61 insertions, 1 deletions
diff --git a/rs/Cargo.lock b/rs/Cargo.lock
index f3beb9e..d5a8108 100644
--- a/rs/Cargo.lock
+++ b/rs/Cargo.lock
@@ -53,6 +53,17 @@ dependencies = [
53] 53]
54 54
55[[package]] 55[[package]]
56name = "atty"
57version = "0.2.14"
58source = "registry+https://github.com/rust-lang/crates.io-index"
59checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
60dependencies = [
61 "hermit-abi 0.1.19",
62 "libc",
63 "winapi",
64]
65
66[[package]]
56name = "autocfg" 67name = "autocfg"
57version = "1.1.0" 68version = "1.1.0"
58source = "registry+https://github.com/rust-lang/crates.io-index" 69source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -763,6 +774,19 @@ dependencies = [
763] 774]
764 775
765[[package]] 776[[package]]
777name = "env_logger"
778version = "0.9.3"
779source = "registry+https://github.com/rust-lang/crates.io-index"
780checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
781dependencies = [
782 "atty",
783 "humantime",
784 "log",
785 "regex",
786 "termcolor",
787]
788
789[[package]]
766name = "equivalent" 790name = "equivalent"
767version = "1.0.1" 791version = "1.0.1"
768source = "registry+https://github.com/rust-lang/crates.io-index" 792source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -930,6 +954,15 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
930 954
931[[package]] 955[[package]]
932name = "hermit-abi" 956name = "hermit-abi"
957version = "0.1.19"
958source = "registry+https://github.com/rust-lang/crates.io-index"
959checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
960dependencies = [
961 "libc",
962]
963
964[[package]]
965name = "hermit-abi"
933version = "0.3.3" 966version = "0.3.3"
934source = "registry+https://github.com/rust-lang/crates.io-index" 967source = "registry+https://github.com/rust-lang/crates.io-index"
935checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" 968checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
@@ -1024,6 +1057,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1024checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" 1057checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
1025 1058
1026[[package]] 1059[[package]]
1060name = "humantime"
1061version = "2.1.0"
1062source = "registry+https://github.com/rust-lang/crates.io-index"
1063checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
1064
1065[[package]]
1027name = "hyper" 1066name = "hyper"
1028version = "0.14.28" 1067version = "0.14.28"
1029source = "registry+https://github.com/rust-lang/crates.io-index" 1068source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1278,7 +1317,7 @@ version = "1.16.0"
1278source = "registry+https://github.com/rust-lang/crates.io-index" 1317source = "registry+https://github.com/rust-lang/crates.io-index"
1279checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" 1318checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
1280dependencies = [ 1319dependencies = [
1281 "hermit-abi", 1320 "hermit-abi 0.3.3",
1282 "libc", 1321 "libc",
1283] 1322]
1284 1323
@@ -1715,6 +1754,7 @@ dependencies = [
1715 "base64", 1754 "base64",
1716 "chrono", 1755 "chrono",
1717 "common", 1756 "common",
1757 "env_logger",
1718 "mime", 1758 "mime",
1719 "serde", 1759 "serde",
1720 "serde_json", 1760 "serde_json",
@@ -1843,6 +1883,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1843checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" 1883checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
1844 1884
1845[[package]] 1885[[package]]
1886name = "termcolor"
1887version = "1.4.1"
1888source = "registry+https://github.com/rust-lang/crates.io-index"
1889checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
1890dependencies = [
1891 "winapi-util",
1892]
1893
1894[[package]]
1846name = "thread_local" 1895name = "thread_local"
1847version = "1.1.7" 1896version = "1.1.7"
1848source = "registry+https://github.com/rust-lang/crates.io-index" 1897source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2205,6 +2254,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2205checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" 2254checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
2206 2255
2207[[package]] 2256[[package]]
2257name = "winapi-util"
2258version = "0.1.6"
2259source = "registry+https://github.com/rust-lang/crates.io-index"
2260checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
2261dependencies = [
2262 "winapi",
2263]
2264
2265[[package]]
2208name = "winapi-x86_64-pc-windows-gnu" 2266name = "winapi-x86_64-pc-windows-gnu"
2209version = "0.4.0" 2267version = "0.4.0"
2210source = "registry+https://github.com/rust-lang/crates.io-index" 2268source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/rs/server/Cargo.toml b/rs/server/Cargo.toml
index edb76d8..0572cac 100644
--- a/rs/server/Cargo.toml
+++ b/rs/server/Cargo.toml
@@ -10,6 +10,7 @@ axum = "0.7"
10base64 = "0.21" 10base64 = "0.21"
11chrono = { version = "0.4", features = ["serde"] } 11chrono = { version = "0.4", features = ["serde"] }
12common = { path = "../common" } 12common = { path = "../common" }
13env_logger = "0.9.0"
13mime = "0.3" 14mime = "0.3"
14serde = { version = "1", features = ["derive"] } 15serde = { version = "1", features = ["derive"] }
15serde_json = "1" 16serde_json = "1"
diff --git a/rs/server/src/main.rs b/rs/server/src/main.rs
index b346bc6..e816dde 100644
--- a/rs/server/src/main.rs
+++ b/rs/server/src/main.rs
@@ -160,6 +160,7 @@ fn get_s3_client(env: &Env) -> Result<aws_sdk_s3::Client, std::io::Error> {
160 160
161#[tokio::main] 161#[tokio::main]
162async fn main() -> ExitCode { 162async fn main() -> ExitCode {
163 env_logger::init();
163 tracing_subscriber::fmt::init(); 164 tracing_subscriber::fmt::init();
164 165
165 let env = match Env::load() { 166 let env = match Env::load() {