@@ -6,8 +6,8 @@ use graph::util::security::SafeDisplay;
6
6
7
7
use std:: collections:: HashMap ;
8
8
use std:: fmt;
9
- use std:: sync:: { Arc , Mutex } ;
10
- use std:: time:: { Duration , Instant } ;
9
+ use std:: sync:: Arc ;
10
+ use std:: time:: Duration ;
11
11
12
12
struct ErrorHandler ( Logger , Box < Counter > ) ;
13
13
@@ -29,7 +29,6 @@ struct EventHandler {
29
29
count_gauge : Box < Gauge > ,
30
30
wait_gauge : Box < Gauge > ,
31
31
wait_stats : PoolWaitStats ,
32
- last_log : Mutex < Instant > ,
33
32
}
34
33
35
34
impl EventHandler {
@@ -53,32 +52,17 @@ impl EventHandler {
53
52
count_gauge,
54
53
wait_gauge,
55
54
wait_stats,
56
- last_log : Mutex :: new ( Instant :: now ( ) ) ,
57
55
}
58
56
}
59
57
60
58
fn add_wait_time ( & self , duration : Duration ) {
61
- let should_log = {
62
- // Log average wait time, but at most every 10s
63
- let mut last_log = self . last_log . lock ( ) . unwrap ( ) ;
64
- if last_log. elapsed ( ) > Duration :: from_secs ( 10 ) {
65
- * last_log = Instant :: now ( ) ;
66
- true
67
- } else {
68
- false
69
- }
70
- } ;
71
59
let wait_avg = {
72
60
let mut wait_stats = self . wait_stats . write ( ) . unwrap ( ) ;
73
61
wait_stats. add ( duration) ;
74
62
wait_stats. average ( )
75
63
} ;
76
64
let wait_avg = wait_avg. map ( |wait_avg| wait_avg. as_millis ( ) ) . unwrap_or ( 0 ) ;
77
65
self . wait_gauge . set ( wait_avg as f64 ) ;
78
- if should_log {
79
- info ! ( self . logger, "Average connection wait time" ;
80
- "wait_ms" => wait_avg) ;
81
- }
82
66
}
83
67
}
84
68
0 commit comments