diff options
Diffstat (limited to 'adapter/statsclient')
-rw-r--r-- | adapter/statsclient/stat_segment.go | 4 | ||||
-rw-r--r-- | adapter/statsclient/statsclient.go | 35 |
2 files changed, 23 insertions, 16 deletions
diff --git a/adapter/statsclient/stat_segment.go b/adapter/statsclient/stat_segment.go index 1875f17..e8d20b0 100644 --- a/adapter/statsclient/stat_segment.go +++ b/adapter/statsclient/stat_segment.go @@ -117,11 +117,11 @@ func (c *statSegment) connect(sockName string) error { header := c.readHeader() Log.Debugf("stat segment header: %+v", header) - // older VPP (19.04) did not have version in stat segment header + // older VPP (<=19.04) did not have version in stat segment header // we try to provide fallback support by skipping it in header if header.version > MaxVersion && header.inProgress > 1 && header.epoch == 0 { h := c.readHeaderOld() - Log.Warnf("statsclient: falling back to old stat segment version (VPP 19.04): %+v", h) + Log.Debugf("statsclient: falling back to old stat segment version (VPP <=19.04): %+v", h) c.oldHeader = true } 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) |