From 52468bb63ed3721e1ee8d4a1bd9c07ad540429f4 Mon Sep 17 00:00:00 2001
From: Hector <dev@hsmith.org>
Date: Mon, 11 Oct 2021 21:59:56 +0100
Subject: [PATCH] disable collector correctly

---
 src/cfg/cfg.go         | 3 ---
 src/textfile/writer.go | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cfg/cfg.go b/src/cfg/cfg.go
index 457a9b3..894c901 100644
--- a/src/cfg/cfg.go
+++ b/src/cfg/cfg.go
@@ -46,9 +46,6 @@ func (settings *AppSettings) validateFlags() {
 				minServerPort, maxServerPort, settings.MetricsPort)
 			flagsValid = false
 		}
-		if settings.FileCollectorPath != "" {
-			settings.FileCollectorEnabled = true
-		}
 		if settings.FileCollectorEnabled && settings.FileCollectorPath == "" {
 			fmt.Printf("file collector directory path must not be empty if collector enabled\n")
 			flagsValid = false
diff --git a/src/textfile/writer.go b/src/textfile/writer.go
index 7e49ce8..129df6a 100644
--- a/src/textfile/writer.go
+++ b/src/textfile/writer.go
@@ -9,6 +9,10 @@ import (
 )
 
 func (c *Collector) WriteTextFileMetrics(w http.ResponseWriter, r *http.Request) {
+	if !c.enabled {
+		return
+	}
+
 	files, err := ioutil.ReadDir(c.folderPath)
 	if err != nil {
 		c.appendErrorForPath(c.folderPath)