Fixing some linter errors

lfdominguez · Aug 6, 2020 · 0bddb3b · 0bddb3b
1 parent e06928b
commit 0bddb3b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -52,14 +52,9 @@ async fn main() {
         let config_reader = global_config::SETTINGS.read().unwrap();
 
         loop {
-            redis::get_redis_hosts(ping_thread_log.clone())
+            redis::get_redis_hosts(&ping_thread_log)
                 .map(|hosts| {
-                    task::do_ping_task(
-                        ping_thread_log.clone(),
-                        &mut historical_hosts,
-                        hosts,
-                        hostname.clone(),
-                    );
+                    task::do_ping(&ping_thread_log, &mut historical_hosts, hosts, &hostname);
                 })
                 .unwrap_or_default();
 

diff --git a/src/redis.rs b/src/redis.rs
@@ -13,7 +13,7 @@ impl PartialEq for Host {
     }
 }
 
-pub fn get_redis_hosts(ping_thread_log: Logger) -> Result<Vec<Host>, ()> {
+pub fn get_redis_hosts(ping_thread_log: &Logger) -> Result<Vec<Host>, ()> {
     let redis_host = crate::global_config::SETTINGS
         .read()
         .unwrap()

diff --git a/src/task.rs b/src/task.rs
@@ -4,13 +4,13 @@ use fastping_rs::Pinger;
 use slog::Logger;
 use std::collections::HashMap;
 
-pub fn do_ping_task(
-    ping_thread_log: Logger,
+pub fn do_ping(
+    ping_thread_log: &Logger,
     historical_hosts: &mut HashMap<String, String>,
     hosts: Vec<Host>,
-    hostname: String,
+    hostname: &str,
 ) {
-    let local_inet_address = crate::utils::ifaddrs(ping_thread_log.clone());
+    let local_inet_address = crate::utils::ifaddrs(ping_thread_log);
 
     let config_reader = crate::global_config::SETTINGS.read().unwrap();
 
@@ -42,16 +42,16 @@ pub fn do_ping_task(
 
     for deleted_host in deleted_hosts {
         crate::prom::PING_LATENCY_HISTOGRAM
-            .remove_label_values(&[&deleted_host.0[..], &deleted_host.1[..], &hostname[..]])
+            .remove_label_values(&[&deleted_host.0[..], &deleted_host.1[..], hostname])
             .unwrap_or_default();
         crate::prom::PING_ERROR_COUNT
-            .remove_label_values(&[&deleted_host.0[..], &deleted_host.1[..], &hostname[..]])
+            .remove_label_values(&[&deleted_host.0[..], &deleted_host.1[..], hostname])
             .unwrap_or_default();
         crate::prom::PING_LAST
-            .remove_label_values(&[&deleted_host.0[..], &deleted_host.1[..], &hostname[..]])
+            .remove_label_values(&[&deleted_host.0[..], &deleted_host.1[..], hostname])
             .unwrap_or_default();
         crate::prom::HOST_UP
-            .remove_label_values(&[&deleted_host.0[..], &deleted_host.1[..], &hostname[..]])
+            .remove_label_values(&[&deleted_host.0[..], &deleted_host.1[..], hostname])
             .unwrap_or_default();
     }
 
@@ -99,21 +99,21 @@ pub fn do_ping_task(
                             .with_label_values(&[
                                 &addr_str[..],
                                 &historical_hosts[&addr_str][..],
-                                &hostname[..],
+                                hostname,
                             ])
                             .inc();
                         crate::prom::PING_LAST
                             .remove_label_values(&[
                                 &addr_str[..],
                                 &historical_hosts[&addr_str][..],
-                                &hostname[..],
+                                hostname,
                             ])
                             .unwrap_or_default();
                         crate::prom::HOST_UP
                             .with_label_values(&[
                                 &addr_str[..],
                                 &historical_hosts[&addr_str][..],
-                                &hostname[..],
+                                hostname,
                             ])
                             .set(0.0);
                         warn!(ping_thread_log, "No response from host"; "host" => addr_str);
@@ -126,21 +126,21 @@ pub fn do_ping_task(
                             .with_label_values(&[
                                 &addr_str[..],
                                 &historical_hosts[&addr_str][..],
-                                &hostname[..],
+                                hostname,
                             ])
                             .observe(millis as f64);
                         crate::prom::PING_LAST
                             .with_label_values(&[
                                 &addr_str[..],
                                 &historical_hosts[&addr_str][..],
-                                &hostname[..],
+                                hostname,
                             ])
                             .set(millis as f64);
                         crate::prom::HOST_UP
                             .with_label_values(&[
                                 &addr_str[..],
                                 &historical_hosts[&addr_str][..],
-                                &hostname[..],
+                                hostname,
                             ])
                             .set(1.0);
 

diff --git a/src/utils.rs b/src/utils.rs
@@ -3,7 +3,7 @@ use nix::sys::socket::SockAddr::Inet;
 use nix::unistd::gethostname;
 use slog::Logger;
 
-pub fn ifaddrs(ping_thread_log: Logger) -> Vec<String> {
+pub fn ifaddrs(ping_thread_log: &Logger) -> Vec<String> {
     let mut local_inet_address = vec![];
 
     for ifaddr in getifaddrs().unwrap() {
@@ -28,7 +28,7 @@ pub fn ifaddrs(ping_thread_log: Logger) -> Vec<String> {
 }
 
 pub fn host_name() -> String {
-    let mut buf = [0u8; 128];
+    let mut buf = [0_u8; 128];
     let hostname_cstr = gethostname(&mut buf).expect("Failed getting hostname");
     let hostname = hostname_cstr.to_str().expect("Hostname wasn't valid UTF-8");