From ca95494a83a4e975e59332b09d80f7dc17b1d595 Mon Sep 17 00:00:00 2001
From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Date: Wed, 11 Feb 2026 12:15:58 +0100
Subject: [PATCH] Use cclog for logging

---
 collectors/beegfsmetaMetric.go    | 19 +++++++++++--------
 collectors/beegfsstorageMetric.go | 19 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/collectors/beegfsmetaMetric.go b/collectors/beegfsmetaMetric.go
index 5d44878..5c6f4e6 100644
--- a/collectors/beegfsmetaMetric.go
+++ b/collectors/beegfsmetaMetric.go
@@ -104,7 +104,7 @@ func (m *BeegfsMetaCollector) Init(config json.RawMessage) error {
 	// Beegfs file system statistics can only be queried by user root
 	user, err := user.Current()
 	if err != nil {
-		return fmt.Errorf("BeegfsMetaCollector.Init(): Failed to get current user: %v", err)
+		return fmt.Errorf("BeegfsMetaCollector.Init(): Failed to get current user: %w", err)
 	}
 	if user.Uid != "0" {
 		return fmt.Errorf("BeegfsMetaCollector.Init(): BeeGFS file system statistics can only be queried by user root")
@@ -113,7 +113,7 @@ func (m *BeegfsMetaCollector) Init(config json.RawMessage) error {
 	// Check if beegfs-ctl is in executable search path
 	_, err = exec.LookPath(m.config.Beegfs)
 	if err != nil {
-		return fmt.Errorf("BeegfsMetaCollector.Init(): Failed to find beegfs-ctl binary '%s': %v", m.config.Beegfs, err)
+		return fmt.Errorf("BeegfsMetaCollector.Init(): Failed to find beegfs-ctl binary '%s': %w", m.config.Beegfs, err)
 	}
 	m.init = true
 	return nil
@@ -164,12 +164,15 @@ func (m *BeegfsMetaCollector) Read(interval time.Duration, output chan lp.CCMess
 		cmd.Stderr = cmdStderr
 		err := cmd.Run()
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "BeegfsMetaCollector.Read(): Failed to execute command \"%s\": %s\n", cmd.String(), err.Error())
-			fmt.Fprintf(os.Stderr, "BeegfsMetaCollector.Read(): command exit code: \"%d\"\n", cmd.ProcessState.ExitCode())
-			data, _ := io.ReadAll(cmdStderr)
-			fmt.Fprintf(os.Stderr, "BeegfsMetaCollector.Read(): command stderr: \"%s\"\n", string(data))
-			data, _ = io.ReadAll(cmdStdout)
-			fmt.Fprintf(os.Stderr, "BeegfsMetaCollector.Read(): command stdout: \"%s\"\n", string(data))
+			dataStdErr, _ := io.ReadAll(cmdStderr)
+			dataStdOut, _ := io.ReadAll(cmdStdout)
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to execute command \"%s\": %v\n", cmd.String(), err),
+				fmt.Sprintf("Read(): command exit code: \"%d\"\n", cmd.ProcessState.ExitCode()),
+				fmt.Sprintf("Read(): command stderr: \"%s\"\n", string(dataStdErr)),
+				fmt.Sprintf("Read(): command stdout: \"%s\"\n", string(dataStdOut)),
+			)
 			return
 		}
 		// Read I/O statistics
diff --git a/collectors/beegfsstorageMetric.go b/collectors/beegfsstorageMetric.go
index feb8604..8d46e35 100644
--- a/collectors/beegfsstorageMetric.go
+++ b/collectors/beegfsstorageMetric.go
@@ -97,7 +97,7 @@ func (m *BeegfsStorageCollector) Init(config json.RawMessage) error {
 	// Beegfs file system statistics can only be queried by user root
 	user, err := user.Current()
 	if err != nil {
-		return fmt.Errorf("BeegfsStorageCollector.Init(): Failed to get current user: %v", err)
+		return fmt.Errorf("BeegfsStorageCollector.Init(): Failed to get current user: %w", err)
 	}
 	if user.Uid != "0" {
 		return fmt.Errorf("BeegfsStorageCollector.Init(): BeeGFS file system statistics can only be queried by user root")
@@ -106,7 +106,7 @@ func (m *BeegfsStorageCollector) Init(config json.RawMessage) error {
 	// Check if beegfs-ctl is in executable search path
 	_, err = exec.LookPath(m.config.Beegfs)
 	if err != nil {
-		return fmt.Errorf("BeegfsStorageCollector.Init(): Failed to find beegfs-ctl binary '%s': %v", m.config.Beegfs, err)
+		return fmt.Errorf("BeegfsStorageCollector.Init(): Failed to find beegfs-ctl binary '%s': %w", m.config.Beegfs, err)
 	}
 	m.init = true
 	return nil
@@ -156,12 +156,15 @@ func (m *BeegfsStorageCollector) Read(interval time.Duration, output chan lp.CCM
 		cmd.Stderr = cmdStderr
 		err := cmd.Run()
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "BeegfsStorageCollector.Read(): Failed to execute command \"%s\": %s\n", cmd.String(), err.Error())
-			fmt.Fprintf(os.Stderr, "BeegfsStorageCollector.Read(): command exit code: \"%d\"\n", cmd.ProcessState.ExitCode())
-			data, _ := io.ReadAll(cmdStderr)
-			fmt.Fprintf(os.Stderr, "BeegfsStorageCollector.Read(): command stderr: \"%s\"\n", string(data))
-			data, _ = io.ReadAll(cmdStdout)
-			fmt.Fprintf(os.Stderr, "BeegfsStorageCollector.Read(): command stdout: \"%s\"\n", string(data))
+			dataStdErr, _ := io.ReadAll(cmdStderr)
+			dataStdOut, _ := io.ReadAll(cmdStdout)
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to execute command \"%s\": %v\n", cmd.String(), err),
+				fmt.Sprintf("Read(): command exit code: \"%d\"\n", cmd.ProcessState.ExitCode()),
+				fmt.Sprintf("Read(): command stderr: \"%s\"\n", string(dataStdErr)),
+				fmt.Sprintf("Read(): command stdout: \"%s\"\n", string(dataStdOut)),
+			)
 			return
 		}
 		// Read I/O statistics