From e7e136195b07b29f6bcaf879ab0f3edaddebfcc0 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Sat, 13 Nov 2021 19:43:39 +0100
Subject: [PATCH] Fix metrics check when disabled

Previously, disabled metrics had no effect and a request to the
`/metrics` route was answered nonetheless.

Remove needles borrow
---
 src/main.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 815ec9e..e638791 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -425,12 +425,14 @@ async fn metrics(
     config: &State<Config>,
 ) -> Option<String> {
     if let Some(metrics_config) = &config.metrics {
-        if let Some(filter) = &metrics_config.ip_filter {
-            if filter.validate(&address.ip()) {
+        if metrics_config.enabled {
+            if let Some(filter) = &metrics_config.ip_filter {
+                if filter.validate(&address.ip()) {
+                    return Some(get_metrics(metrics));
+                }
+            } else {
                 return Some(get_metrics(metrics));
             }
-        } else {
-            return Some(get_metrics(metrics));
         }
     }