Page MenuHomePhorge
Files F32559648

D8401.1767285202.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D8401.1767285202.diff
View Options

diff --git a/services/identity/Cargo.lock b/services/identity/Cargo.lock
--- a/services/identity/Cargo.lock
+++ b/services/identity/Cargo.lock
@@ -1610,6 +1610,15 @@
"libc",
]
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata",
+]
+
[[package]]
name = "matchit"
version = "0.7.0"
@@ -2143,9 +2152,24 @@
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax",
+ "regex-syntax 0.7.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
]
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
[[package]]
name = "regex-syntax"
version = "0.7.2"
@@ -2854,10 +2878,14 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
dependencies = [
+ "matchers",
"nu-ansi-term",
+ "once_cell",
+ "regex",
"sharded-slab",
"smallvec",
"thread_local",
+ "tracing",
"tracing-core",
"tracing-log",
]
diff --git a/services/identity/Cargo.toml b/services/identity/Cargo.toml
--- a/services/identity/Cargo.toml
+++ b/services/identity/Cargo.toml
@@ -14,7 +14,7 @@
aws-config = "0.54.0"
aws-sdk-dynamodb = "0.24.0"
tracing = "0.1"
-tracing-subscriber = "0.3"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
chrono = "0.4.19"
rand = "0.8"
constant_time_eq = "0.2.2"
diff --git a/services/identity/src/client_service.rs b/services/identity/src/client_service.rs
--- a/services/identity/src/client_service.rs
+++ b/services/identity/src/client_service.rs
@@ -94,6 +94,8 @@
request: tonic::Request<RegistrationStartRequest>,
) -> Result<tonic::Response<RegistrationStartResponse>, tonic::Status> {
let message = request.into_inner();
+ debug!("Received registration request for: {}", message.username);
+
let username_taken = self
.client
.username_taken(message.username.clone())
@@ -413,6 +415,7 @@
) -> Result<tonic::Response<OpaqueLoginStartResponse>, tonic::Status> {
let message = request.into_inner();
+ debug!("Attempting to login user: {:?}", &message.username);
let user_id_and_password_file = self
.client
.get_user_id_and_password_file_from_username(&message.username)
diff --git a/services/identity/src/main.rs b/services/identity/src/main.rs
--- a/services/identity/src/main.rs
+++ b/services/identity/src/main.rs
@@ -20,7 +20,8 @@
use config::load_config;
use constants::{IDENTITY_SERVICE_SOCKET_ADDR, SECRETS_DIRECTORY};
use keygen::generate_and_persist_keypair;
-use tracing::info;
+use tracing::{self, info, Level};
+use tracing_subscriber::EnvFilter;
use client_service::{ClientService, IdentityClientServiceServer};
@@ -48,7 +49,13 @@
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
- let subscriber = FmtSubscriber::new();
+ let filter = EnvFilter::builder()
+ .with_default_directive(Level::INFO.into())
+ .with_env_var(EnvFilter::DEFAULT_ENV)
+ .from_env_lossy();
+
+ let subscriber = tracing_subscriber::fmt().with_env_filter(filter).finish();
+
tracing::subscriber::set_global_default(subscriber)?;
let cli = Cli::parse();
match &cli.command {

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 1, 4:33 PM (19 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5876834
Default Alt Text
D8401.1767285202.diff (3 KB)

Event Timeline