From 137fb19d2ad478a87475d792f3358b76b54f6228 Mon Sep 17 00:00:00 2001
From: Manav Darji <manavdarji.india@gmail.com>
Date: Thu, 24 Nov 2022 19:42:32 +0530
Subject: [PATCH] metrics: handle equal to separated config flag (#596)

* metrics: handle  based config path

* internal/cli/server: add more context to logs

* use space separated flag and value in bor.service
---
 builder/files/bor.service               | 2 +-
 internal/cli/server/server.go           | 8 +++++++-
 metrics/metrics.go                      | 3 +++
 packaging/templates/systemd/bor.service | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/builder/files/bor.service b/builder/files/bor.service
index 2deff3dbc9..758553299e 100644
--- a/builder/files/bor.service
+++ b/builder/files/bor.service
@@ -6,7 +6,7 @@
 [Service]
   Restart=on-failure
   RestartSec=5s
-  ExecStart=/usr/local/bin/bor server -config="/var/lib/bor/config.toml"
+  ExecStart=/usr/local/bin/bor server -config "/var/lib/bor/config.toml"
   Type=simple
   User=bor
   KillSignal=SIGINT
diff --git a/internal/cli/server/server.go b/internal/cli/server/server.go
index 1346fe613a..70187d6985 100644
--- a/internal/cli/server/server.go
+++ b/internal/cli/server/server.go
@@ -235,7 +235,13 @@ func (s *Server) Stop() {
 func (s *Server) setupMetrics(config *TelemetryConfig, serviceName string) error {
 	// Check the global metrics if they're matching with the provided config
 	if metrics.Enabled != config.Enabled || metrics.EnabledExpensive != config.Expensive {
-		log.Warn("Metric misconfiguration, some of them might not be visible")
+		log.Warn(
+			"Metric misconfiguration, some of them might not be visible",
+			"metrics", metrics.Enabled,
+			"config.metrics", config.Enabled,
+			"expensive", metrics.EnabledExpensive,
+			"config.expensive", config.Expensive,
+		)
 	}
 
 	// Update the values anyways (for services which don't need immediate attention)
diff --git a/metrics/metrics.go b/metrics/metrics.go
index 1d0133e850..1c0cf11ab4 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -49,6 +49,9 @@ func init() {
 		// check for existence of `config` flag
 		if flag == configFlag && i < len(os.Args)-1 {
 			configFile = strings.TrimLeft(os.Args[i+1], "-") // find the value of flag
+		} else if len(flag) > 6 && flag[:6] == configFlag {
+			// Checks for `=` separated flag (e.g. config=path)
+			configFile = strings.TrimLeft(flag[6:], "=")
 		}
 
 		for _, enabler := range enablerFlags {
diff --git a/packaging/templates/systemd/bor.service b/packaging/templates/systemd/bor.service
index aa63871d83..b92bdd3cc5 100644
--- a/packaging/templates/systemd/bor.service
+++ b/packaging/templates/systemd/bor.service
@@ -6,7 +6,7 @@
 [Service]
   Restart=on-failure
   RestartSec=5s
-  ExecStart=/usr/bin/bor server -config="/var/lib/bor/config.toml"
+  ExecStart=/usr/bin/bor server -config "/var/lib/bor/config.toml"
   Type=simple
   KillSignal=SIGINT
   User=bor