update durations

ragibkl · Sep 13, 2024 · 2947a83 · 2947a83
1 parent bece86a
commit 2947a83
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/get_logs.hbs b/src/get_logs.hbs
@@ -17,7 +17,7 @@
 
 <body>
   <p>ip address: {{ip}}</p>
-  <p>active ips in last day: {{ active_ips_last_day }}</p>
+  <p>active ips (10 minutes): {{ active_ips }}</p>
 
   <table>
     <tr>

diff --git a/src/handler.rs b/src/handler.rs
@@ -21,7 +21,7 @@ pub struct GetLogsApiOutput {
 pub struct GetLogsOutput {
     ip: String,
     queries: Vec<QueryLog>,
-    active_ips_last_day: usize,
+    active_ips: usize,
 }
 
 #[derive(Clone)]
@@ -69,7 +69,7 @@ pub async fn get_logs(
 
     let ip = get_ip(addr);
     let queries = app_state.logs_store.get_logs_for_ip(&ip);
-    let active_ips_last_day = app_state.usage_stats.get_active_ips_in_last_day();
+    let active_ips = app_state.usage_stats.get_active_ips();
 
     let reg = Handlebars::new();
     let response = reg
@@ -78,7 +78,7 @@ pub async fn get_logs(
             &GetLogsOutput {
                 ip,
                 queries,
-                active_ips_last_day,
+                active_ips,
             },
         )
         .unwrap();

diff --git a/src/logs/mod.rs b/src/logs/mod.rs
@@ -44,7 +44,7 @@ impl LogsConsumer {
         self.logs_store.remove_expired_logs();
 
         self.usage_stats.merge_logs(&logs_hash_map);
-        self.usage_stats.remove_old_query_times();
+        self.usage_stats.remove_old_active_ips();
         tracing::trace!("LogsStore logs_hash_map. DONE");
     }
 }
diff --git a/src/logs/query_logs.rs b/src/logs/query_logs.rs
@@ -14,7 +14,7 @@ pub struct QueryLogs {
 
 impl QueryLogs {
     pub fn remove_expired_logs(&self) {
-        let query_time_cutoff = Utc::now() - Duration::minutes(2);
+        let query_time_cutoff = Utc::now() - Duration::minutes(10);
 
         let mut logs_store_guard = self.logs_store.lock().unwrap();
         for query_logs in logs_store_guard.values_mut() {

diff --git a/src/logs/usage_stats.rs b/src/logs/usage_stats.rs
@@ -9,12 +9,12 @@ use super::QueryLog;
 
 #[derive(Debug, Clone, Default)]
 pub struct UsageStats {
-    active_ips_one_day: Arc<Mutex<HashMap<String, DateTime<Utc>>>>,
+    active_ips: Arc<Mutex<HashMap<String, DateTime<Utc>>>>,
 }
 
 impl UsageStats {
     pub fn merge_logs(&self, logs_hash_map: &HashMap<String, Vec<QueryLog>>) {
-        let mut last_query_times = self.active_ips_one_day.lock().unwrap().clone();
+        let mut last_query_times = self.active_ips.lock().unwrap().clone();
 
         for (ip, queries) in logs_hash_map.iter() {
             let Some(last_qt) = queries.last().map(|q| q.query_time) else {
@@ -29,16 +29,16 @@ impl UsageStats {
             }
         }
 
-        *self.active_ips_one_day.lock().unwrap() = last_query_times;
+        *self.active_ips.lock().unwrap() = last_query_times;
     }
 
-    pub fn remove_old_query_times(&self) {
-        let time_cutoff = Utc::now() - Duration::days(1);
-        let mut active_ips_one_day = self.active_ips_one_day.lock().unwrap();
+    pub fn remove_old_active_ips(&self) {
+        let time_cutoff = Utc::now() - Duration::minutes(10);
+        let mut active_ips_one_day = self.active_ips.lock().unwrap();
         active_ips_one_day.retain(|_ip, qt| *qt > time_cutoff);
     }
 
-    pub fn get_active_ips_in_last_day(&self) -> usize {
-        self.active_ips_one_day.lock().unwrap().len()
+    pub fn get_active_ips(&self) -> usize {
+        self.active_ips.lock().unwrap().len()
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
     <body>
       <p>ip address: {{ip}}</p>
-      <p>active ips in last day: {{ active_ips_last_day }}</p>
+      <p>active ips (10 minutes): {{ active_ips }}</p>
       <table>
         <tr>
@@ Expand Down @@