From 03549c6becebd49ec43c5da7076cabdde993384e Mon Sep 17 00:00:00 2001
From: Dan Christian Bogos <dan@CGRDev2.itsyscom.com>
Date: Thu, 20 Dec 2018 15:39:12 +0100
Subject: [PATCH] Debug info for version and identifying exrta fields in map

---
 cmd/cgr-engine/cgr-engine.go | 8 +++++---
 engine/mapevent.go           | 1 +
 engine/responder.go          | 1 +
 utils/consts.go              | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index d939ceeb8..5fa19269d 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -34,8 +34,8 @@ import (
 
 	"github.com/cgrates/cgrates/agents"
 	"github.com/cgrates/cgrates/analyzers"
-	"github.com/cgrates/cgrates/apier/v1"
-	"github.com/cgrates/cgrates/apier/v2"
+	v1 "github.com/cgrates/cgrates/apier/v1"
+	v2 "github.com/cgrates/cgrates/apier/v2"
 	"github.com/cgrates/cgrates/cdrc"
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/dispatchers"
@@ -1331,8 +1331,9 @@ func shutdownSingnalHandler(exitChan chan bool) {
 
 func main() {
 	flag.Parse()
+	vers := utils.GetCGRVersion()
 	if *version {
-		fmt.Println(utils.GetCGRVersion())
+		fmt.Println(vers)
 		return
 	}
 	if *pidFile != "" {
@@ -1365,6 +1366,7 @@ func main() {
 			return
 		}()
 	}
+	utils.Logger.Debug(fmt.Sprintf("Starting CGRateS with version <%s>", vers))
 	var err error
 	// Init config
 	cfg, err = config.NewCGRConfigFromFolder(*cfgDir)
diff --git a/engine/mapevent.go b/engine/mapevent.go
index a9dc1e5d8..9918d83a5 100644
--- a/engine/mapevent.go
+++ b/engine/mapevent.go
@@ -160,6 +160,7 @@ func (me MapEvent) AsCDR(cfg *config.CGRConfig, tnt, tmz string) (cdr *CDR, err
 	cdr = &CDR{Tenant: tnt, Cost: -1.0, ExtraFields: make(map[string]string)}
 	for k, v := range me {
 		if !utils.IsSliceMember(utils.NotExtraCDRFields, k) { // not primary field, populate extra ones
+			utils.Logger.Debug(fmt.Sprintf("field <%s> as extra since is not present in %s", k, utils.ToJSON(utils.NotExtraCDRFields)))
 			if cdr.ExtraFields[k], err = utils.IfaceAsString(v); err != nil {
 				return nil, err
 			}
diff --git a/engine/responder.go b/engine/responder.go
index 4a223f69e..3557c667c 100644
--- a/engine/responder.go
+++ b/engine/responder.go
@@ -535,6 +535,7 @@ func (rs *Responder) Status(arg string, reply *map[string]interface{}) (err erro
 	response["MemoryUsage"] = utils.SizeFmt(float64(memstats.HeapAlloc), "")
 	response[utils.ActiveGoroutines] = runtime.NumGoroutine()
 	response["Footprint"] = utils.SizeFmt(float64(memstats.Sys), "")
+	response[utils.Version] = utils.GetCGRVersion
 	*reply = response
 	return
 }
diff --git a/utils/consts.go b/utils/consts.go
index 7c5f83762..680649dcc 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -542,6 +542,7 @@ const (
 	TCP                          = "tcp"
 	CGRDebitInterval             = "CGRDebitInterval"
 	MetaAsr                      = "*asr"
+	Version                      = "Version"
 )
 
 // Migrator Action