From ce01ee2f324db68394e9b56abb02294e2c8f7fc8 Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Fri, 10 Jan 2020 12:29:18 +0200
Subject: [PATCH] Update version format to match go module version

---
 agents/astagent.go | 2 +-
 utils/consts.go    | 2 +-
 utils/coreutils.go | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/agents/astagent.go b/agents/astagent.go
index f47141c26..84663accf 100644
--- a/agents/astagent.go
+++ b/agents/astagent.go
@@ -83,7 +83,7 @@ func (sma *AsteriskAgent) connectAsterisk() (err error) {
 	sma.astErrChan = make(chan error)
 	sma.astConn, err = aringo.NewARInGO(fmt.Sprintf("ws://%s/ari/events?api_key=%s:%s&app=%s",
 		connCfg.Address, connCfg.User, connCfg.Password, CGRAuthAPP), "http://cgrates.org",
-		connCfg.User, connCfg.Password, fmt.Sprintf("%s %s", utils.CGRateS, utils.VERSION),
+		connCfg.User, connCfg.Password, fmt.Sprintf("%s@%s", utils.CGRateS, utils.VERSION),
 		sma.astEvChan, sma.astErrChan, connCfg.ConnectAttempts, connCfg.Reconnects)
 	if err != nil {
 		return err
diff --git a/utils/consts.go b/utils/consts.go
index 8aa997308..cecf42894 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -161,7 +161,7 @@ var (
 
 const (
 	CGRateS                      = "CGRateS"
-	VERSION                      = "0.9.1~rc8"
+	VERSION                      = "v0.9.1~rc8"
 	DIAMETER_FIRMWARE_REVISION   = 918
 	REDIS_MAX_CONNS              = 10
 	CGRATES                      = "cgrates"
diff --git a/utils/coreutils.go b/utils/coreutils.go
index ec9bda37a..ea8e66a5d 100644
--- a/utils/coreutils.go
+++ b/utils/coreutils.go
@@ -662,7 +662,7 @@ func CapitalizedMessage(errMessage string) (capStr string) {
 }
 
 func GetCGRVersion() (vers string, err error) {
-	vers = fmt.Sprintf("%s %s", CGRateS, VERSION)
+	vers = fmt.Sprintf("%s@%s", CGRateS, VERSION)
 	if GitLastLog == "" {
 		return vers, nil
 	}
@@ -698,8 +698,8 @@ func GetCGRVersion() (vers string, err error) {
 	if commitHash == "" || commitDate.IsZero() {
 		return vers, fmt.Errorf("Cannot find commitHash or commitDate information")
 	}
-	//CGRateS 0.9.1~rc8 git+73014da (2016-12-30T19:48:09+01:00)
-	return fmt.Sprintf("%s %s git+%s (%s)", CGRateS, VERSION, commitHash[:7], commitDate.Format(time.RFC3339)), nil
+	//CGRateS@v0.9.1~rc8-20200110075344-7572e7b11e00
+	return fmt.Sprintf("%s@%s-%s-%s", CGRateS, VERSION, commitDate.UTC().Format("20060102150405"), commitHash[:12]), nil
 }
 
 func NewTenantID(tntID string) *TenantID {