@@ -4,9 +4,9 @@ use reqwest::{Response, StatusCode};
4
4
5
5
#[ derive( PartialEq , Eq , PartialOrd , Ord , Hash , Debug ) ]
6
6
pub enum CheckResult {
7
- SUCCESS ,
8
- FAILURE ( FailureReason ) ,
9
- MISSED ,
7
+ Success ,
8
+ Failure ( FailureReason ) ,
9
+ Missed ,
10
10
}
11
11
12
12
#[ derive( PartialEq , Eq , PartialOrd , Ord , Hash , Debug ) ]
@@ -34,10 +34,10 @@ pub async fn do_request(
34
34
/// Up is defined as returning a 2xx within a specific timeframe.
35
35
pub async fn check_url ( client : & reqwest:: Client , url : String ) -> CheckResult {
36
36
match do_request ( client, url) . await {
37
- Ok ( _) => CheckResult :: SUCCESS ,
37
+ Ok ( _) => CheckResult :: Success ,
38
38
Err ( e) => {
39
39
if e. is_timeout ( ) {
40
- return CheckResult :: FAILURE ( FailureReason :: Timeout ) ;
40
+ return CheckResult :: Failure ( FailureReason :: Timeout ) ;
41
41
}
42
42
// TODO: More reasons
43
43
let mut inner = & e as & dyn Error ;
@@ -48,13 +48,13 @@ pub async fn check_url(client: &reqwest::Client, url: String) -> CheckResult {
48
48
// Not sure if there's a better way
49
49
let inner_message = inner. to_string ( ) ;
50
50
if inner_message. contains ( "dns error" ) {
51
- return CheckResult :: FAILURE ( FailureReason :: DnsError (
51
+ return CheckResult :: Failure ( FailureReason :: DnsError (
52
52
inner. source ( ) . unwrap ( ) . to_string ( ) ,
53
53
) ) ;
54
54
}
55
55
}
56
56
// TODO: Should incorporate status code somehow
57
- CheckResult :: FAILURE ( FailureReason :: Error ( format ! ( "{:?}" , e) ) )
57
+ CheckResult :: Failure ( FailureReason :: Error ( format ! ( "{:?}" , e) ) )
58
58
}
59
59
}
60
60
}
@@ -93,15 +93,15 @@ mod tests {
93
93
94
94
assert_eq ! (
95
95
check_url( & client, server. url( "/head" ) ) . await ,
96
- CheckResult :: SUCCESS
96
+ CheckResult :: Success
97
97
) ;
98
98
assert_eq ! (
99
99
check_url( & client, server. url( "/no-head" ) ) . await ,
100
- CheckResult :: SUCCESS
100
+ CheckResult :: Success
101
101
) ;
102
102
assert_eq ! (
103
103
check_url( & client, server. url( "/timeout" ) ) . await ,
104
- CheckResult :: FAILURE ( FailureReason :: Timeout )
104
+ CheckResult :: Failure ( FailureReason :: Timeout )
105
105
) ;
106
106
head_mock. assert ( ) ;
107
107
head_disallowed_mock. assert ( ) ;
0 commit comments