astelm/telemt
1
0
Fork 0
mirror of https://github.com/telemt/telemt.git synced 2026-04-16 18:14:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unique IP always in Metrics+API

Browse Source 
Co-Authored-By: brekotis <93345790+brekotis@users.noreply.github.com>
This commit is contained in:
Alexey
2026-03-05 13:21:11 +03:00
parent 7a9c1e79c2
commit 565b4ee923
4 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/users.rs
View File

@@ -112,6 +112,7 @@ pub(super) async fn create_user(
max_unique_ips: updated_limit,
current_connections: 0,
active_unique_ips: 0,
recent_unique_ips: 0,
total_octets: 0,
links: build_user_links(
&cfg,
@@ -300,7 +301,7 @@ pub(super) async fn users_from_config(
startup_detected_ip_v4: Option<IpAddr>,
startup_detected_ip_v6: Option<IpAddr>,
) -> Vec<UserInfo> {
let ip_counts = ip_tracker
let active_ip_counts = ip_tracker
.get_stats()
.await
.into_iter()
@@ -309,6 +310,7 @@ pub(super) async fn users_from_config(
let mut names = cfg.access.users.keys().cloned().collect::<Vec<_>>();
names.sort();
let recent_ip_counts = ip_tracker.get_recent_counts_for_users(&names).await;
let mut users = Vec::with_capacity(names.len());
for username in names {
@@ -340,7 +342,8 @@ pub(super) async fn users_from_config(
data_quota_bytes: cfg.access.user_data_quota.get(&username).copied(),
max_unique_ips: cfg.access.user_max_unique_ips.get(&username).copied(),
current_connections: stats.get_user_curr_connects(&username),
active_unique_ips: ip_counts.get(&username).copied().unwrap_or(0),
active_unique_ips: active_ip_counts.get(&username).copied().unwrap_or(0),
recent_unique_ips: recent_ip_counts.get(&username).copied().unwrap_or(0),
total_octets: stats.get_user_total_octets(&username),
links,
username,