Merge pull request #489 from vbrandl/fix/replace-dotenv

Use dotenvy over unmaintained dotenv
This commit is contained in:
Valentin Brandl 2022-08-31 11:32:33 +02:00 committed by GitHub
commit b4aaa0bcf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 6 deletions

42
Cargo.lock generated
View File

@ -558,6 +558,26 @@ dependencies = [
"crypto-common", "crypto-common",
] ]
[[package]]
name = "dirs"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
dependencies = [
"libc",
"redox_users",
"winapi",
]
[[package]] [[package]]
name = "dlv-list" name = "dlv-list"
version = "0.3.0" version = "0.3.0"
@ -565,10 +585,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
[[package]] [[package]]
name = "dotenv" name = "dotenvy"
version = "0.15.0" version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" checksum = "da3db6fcad7c1fc4abdd99bf5276a4db30d6a819127903a709ed41e5ff016e84"
dependencies = [
"dirs",
]
[[package]] [[package]]
name = "either" name = "either"
@ -876,7 +899,7 @@ dependencies = [
"badge", "badge",
"bytes", "bytes",
"config", "config",
"dotenv", "dotenvy",
"futures", "futures",
"git2", "git2",
"lazy_static", "lazy_static",
@ -1555,6 +1578,17 @@ dependencies = [
"bitflags", "bitflags",
] ]
[[package]]
name = "redox_users"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
"redox_syscall",
"thiserror",
]
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.5.6" version = "1.5.6"

View File

@ -18,7 +18,7 @@ actix-web = "4.1.0"
badge = "0.3.0" badge = "0.3.0"
bytes = "1.2.1" bytes = "1.2.1"
config = { version = "0.13.2", features = ["toml"] } config = { version = "0.13.2", features = ["toml"] }
dotenv = "0.15.0" dotenvy = "0.15.3"
futures = "0.3.24" futures = "0.3.24"
git2 = "0.15.0" git2 = "0.15.0"
lazy_static = "1.4.0" lazy_static = "1.4.0"

View File

@ -3,7 +3,7 @@ use hoc::{config::Settings, telemetry};
use std::net::TcpListener; use std::net::TcpListener;
fn init() { fn init() {
dotenv::dotenv().ok(); dotenvy::dotenv().ok();
openssl_probe::init_ssl_cert_env_vars(); openssl_probe::init_ssl_cert_env_vars();
telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info")) telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"))