From bde85d422c7949ec32fb067e9c36320ccc47fb9e Mon Sep 17 00:00:00 2001
From: Ondrej Fabry <ofabry@cisco.com>
Date: Fri, 19 Jul 2019 05:42:41 +0200
Subject: Print info for users to stderr when socket files are missing

Change-Id: Ibdbfcb78b05cf80945a93ed424a7a2a03b6ea06d
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
---
 adapter/statsclient/statsclient.go | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'adapter/statsclient/statsclient.go')

diff --git a/adapter/statsclient/statsclient.go b/adapter/statsclient/statsclient.go
index f715a70..6381b9f 100644
--- a/adapter/statsclient/statsclient.go
+++ b/adapter/statsclient/statsclient.go
@@ -27,6 +27,25 @@ import (
 	"git.fd.io/govpp.git/adapter"
 )
 
+const (
+	// DefaultSocketName is default VPP stats socket file path.
+	DefaultSocketName = adapter.DefaultStatsSocket
+)
+
+const socketMissing = `
+------------------------------------------------------------
+ VPP stats socket file %s is missing!
+
+  - is VPP running with stats segment enabled?
+  - is the correct socket name configured?
+
+ To enable it add following section to your VPP config:
+   statseg {
+     default
+   }
+------------------------------------------------------------
+`
+
 var (
 	// Debug is global variable that determines debug mode
 	Debug = os.Getenv("DEBUG_GOVPP_STATS") != ""
@@ -55,29 +74,17 @@ type StatsClient struct {
 // NewStatsClient returns new VPP stats API client.
 func NewStatsClient(sockAddr string) *StatsClient {
 	if sockAddr == "" {
-		sockAddr = adapter.DefaultStatsSocket
+		sockAddr = DefaultSocketName
 	}
 	return &StatsClient{
 		sockAddr: sockAddr,
 	}
 }
 
-const sockNotFoundWarn = `stats socket not found at: %s
-------------------------------------------------------------
- VPP stats socket is missing!
- Is VPP running with stats segment enabled?
-
- To enable it add following section to startup config:
-   statseg {
-     default
-   }
-------------------------------------------------------------
-`
-
 func (c *StatsClient) Connect() error {
 	// check if socket exists
 	if _, err := os.Stat(c.sockAddr); os.IsNotExist(err) {
-		Log.Warnf(sockNotFoundWarn, c.sockAddr)
+		fmt.Fprintf(os.Stderr, socketMissing, c.sockAddr)
 		return fmt.Errorf("stats socket file %s does not exist", c.sockAddr)
 	} else if err != nil {
 		return fmt.Errorf("stats socket error: %v", err)
-- 
cgit 1.2.3-korg