euzu/tuliprox
1
0
Fork 0
mirror of https://github.com/euzu/tuliprox.git synced 2026-10-13 03:12:19 +02:00
Code Issues Packages Projects Releases 5 Wiki Activity

feat: enhenced session logging -> print user from pool

Browse Source
This commit is contained in:
knylbyte
2025-12-17 21:13:56 +01:00
parent d7d1ade12d
commit 0ccbd86e30
2 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/api/api_utils.rs
+32 -7
View File
@@ -365,26 +365,51 @@ async fn resolve_streaming_strategy(
let stream = create_provider_connections_exhausted_stream(&app_state.app_config, &[]);
ProviderStreamState::Custom(stream)
}
ProviderAllocation::Available(ref provider)
| ProviderAllocation::GracePeriod(ref provider) => {
ProviderAllocation::Available(ref provider_cfg)
| ProviderAllocation::GracePeriod(ref provider_cfg) => {
let allocation_kind = match allocation {
ProviderAllocation::Available(_) => "available",
ProviderAllocation::GracePeriod(_) => "grace_period",
ProviderAllocation::Exhausted => "exhausted",
};
// force_stream_provider means we keep the url and the provider.
// If force_stream_provider or the input is the same as the config we don't need to get new url
let (provider, url) = if force_provider.is_some() || provider.id == input.id {
let (selected_provider_name, url) = if force_provider.is_some() || provider_cfg.id == input.id {
(input.name.clone(), stream_url.to_string())
} else {
(
provider.name.clone(),
get_stream_alternative_url(stream_url, input, provider),
provider_cfg.name.clone(),
get_stream_alternative_url(stream_url, input, provider_cfg),
)
};
if let Some(user_info) = provider_cfg.get_user_info() {
debug_if_enabled!(
"provider session: input={} provider_cfg={} user={} allocation={} stream_url={}",
sanitize_sensitive_info(&input.name),
sanitize_sensitive_info(&provider_cfg.name),
sanitize_sensitive_info(&user_info.username),
allocation_kind,
sanitize_sensitive_info(&url)
);
} else {
debug_if_enabled!(
"provider session: input={} provider_cfg={} user=? allocation={} stream_url={}",
sanitize_sensitive_info(&input.name),
sanitize_sensitive_info(&provider_cfg.name),
allocation_kind,
sanitize_sensitive_info(&url)
);
}
match allocation {
ProviderAllocation::Exhausted => {
let stream = create_provider_connections_exhausted_stream(&app_state.app_config, &[]);
ProviderStreamState::Custom(stream)
},
ProviderAllocation::Available(_) => ProviderStreamState::Available(Some(provider), url),
ProviderAllocation::GracePeriod(_) => ProviderStreamState::GracePeriod(Some(provider), url),
ProviderAllocation::Available(_) => ProviderStreamState::Available(Some(selected_provider_name), url),
ProviderAllocation::GracePeriod(_) => ProviderStreamState::GracePeriod(Some(selected_provider_name), url),
}
}
}
backend/src/api/model/provider_lineup_manager.rs
+9 -7
View File
@@ -656,13 +656,15 @@ impl ProviderLineupManager {
fn log_allocation(allocation: &ProviderAllocation) {
if log_enabled!(log::Level::Debug) {
match allocation {
ProviderAllocation::Exhausted => {}
ProviderAllocation::Available(ref cfg) |
ProviderAllocation::GracePeriod(ref cfg) => {
debug!("Using provider {}", cfg.name);
}
match allocation {
ProviderAllocation::Exhausted => {}
ProviderAllocation::Available(ref cfg) | ProviderAllocation::GracePeriod(ref cfg) => {
debug_if_enabled!(
"Using provider {} (pool user: {})",
sanitize_sensitive_info(&cfg.name),
cfg.get_user_info()
.map_or_else(|| "?".to_string(), |ui| sanitize_sensitive_info(&ui.username).to_string())
);
}
}
}