From dabcb97b42364c082c2d2009fae9e517fba16f4e Mon Sep 17 00:00:00 2001 From: TeoV Date: Tue, 12 May 2020 17:21:13 +0300 Subject: [PATCH] Update version v0.10.2~dev in utils --- data/ansible/rpm_packages/cgrates.spec.j2 | 2 +- packages/debian/changelog | 6 +++++- utils/consts.go | 3 +-- utils/coreutils.go | 6 ------ utils/coreutils_test.go | 19 +++++++++---------- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/data/ansible/rpm_packages/cgrates.spec.j2 b/data/ansible/rpm_packages/cgrates.spec.j2 index 8bd864724..a1f31534e 100644 --- a/data/ansible/rpm_packages/cgrates.spec.j2 +++ b/data/ansible/rpm_packages/cgrates.spec.j2 @@ -1,5 +1,5 @@ {{ ansible_managed | comment }} -%global version 0.10.1 +%global version 0.10.2~dev %define debug_package %{nil} %global _logdir /var/log/%name diff --git a/packages/debian/changelog b/packages/debian/changelog index bb2e3b828..125da05ed 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -1,3 +1,7 @@ +cgrates (0.10.2~dev) UNRELEASED; urgency=medium + + -- DanB Tue, 12 May 2020 13:08:15 +0300 + cgrates (0.10.1) UNRELEASED; urgency=medium * [FilterS] Removed rals_conns in favor of reading the account @@ -27,7 +31,7 @@ cgrates (0.10.1) UNRELEASED; urgency=medium * [Engine] Skip caching is limit is 0 * [CacheS] Avoid long recaching - -- DanB Wed, 19 Feb 2020 15:22:59 +0200 + -- DanB Wed, 5 May 2020 15:22:59 +0200 cgrates (0.10.0) UNRELEASED; urgency=medium diff --git a/utils/consts.go b/utils/consts.go index 09ea2574c..b8f226435 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -136,7 +136,7 @@ var ( const ( CGRateS = "CGRateS" - VERSION = "v0.10.1" + VERSION = "v0.10.2~dev" DIAMETER_FIRMWARE_REVISION = 918 REDIS_MAX_CONNS = 10 CGRATES = "cgrates" @@ -1964,7 +1964,6 @@ const ( ) - // Strip/Padding strategy var ( // common diff --git a/utils/coreutils.go b/utils/coreutils.go index 262d4be7f..7fcada9a7 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -67,12 +67,6 @@ func init() { math_rand.Seed(startCGRateSTime.UnixNano()) } -/* -func GetTimeElapsedFromStart() string { - return time.Now().Sub(startCGRateSTime).Round(time.Second).String() -} -*/ - // GetStartTime return the Start time of engine (in UNIX format) func GetStartTime() string { return startCGRateSTime.Format(time.UnixDate) diff --git a/utils/coreutils_test.go b/utils/coreutils_test.go index c7e3c86b8..cf64b2332 100644 --- a/utils/coreutils_test.go +++ b/utils/coreutils_test.go @@ -1085,7 +1085,7 @@ func TestCapitalizedMessage(t *testing.T) { t.Errorf("Received: <%s>", capMsg) } } -/* + func TestGetCGRVersion(t *testing.T) { GitLastLog = `commit 73014daa0c1d7edcb532d5fe600b8a20d588cdf8 Author: DanB @@ -1093,7 +1093,7 @@ Date: Fri Dec 30 19:48:09 2016 +0100 Fixes for db driver to avoid returning new values in case of errors ` - eVers := "CGRateS@v0.10.1" + eVers := "CGRateS@v0.10.2~dev-20161230184809-73014daa0c1d" if vers, err := GetCGRVersion(); err != nil { t.Error(err) } else if vers != eVers { @@ -1102,34 +1102,34 @@ Date: Fri Dec 30 19:48:09 2016 +0100 GitLastLog = "" if vers, err := GetCGRVersion(); err != nil { t.Error(err) - } else if vers != "CGRateS@v0.10.1~dev" { - t.Errorf("Expecting: , received: <%s>", vers) + } else if vers != "CGRateS@v0.10.2~dev" { + t.Errorf("Expecting: , received: <%s>", vers) } GitLastLog = "\n" if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - error: reading line from file" { t.Error(err) - } else if vers != "CGRateS@v0.10.1~dev" { + } else if vers != "CGRateS@v0.10.2~dev" { t.Errorf("Expecting: , received: <%s>", vers) } GitLastLog = `commit . . . ` if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - cannot extract commit hash" { t.Error(err) - } else if vers != "CGRateS@v0.10.1~dev" { + } else if vers != "CGRateS@v0.10.2~dev" { t.Errorf("Expecting: , received: <%s>", vers) } GitLastLog = `Date: : : ` if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - cannot split commit date" { t.Error(err) - } else if vers != "CGRateS@v0.10.1~dev" { + } else if vers != "CGRateS@v0.10.2~dev" { t.Errorf("Expecting: , received: <%s>", vers) } GitLastLog = `Date: wrong format ` if vers, err := GetCGRVersion(); err == nil || err.Error() != `Building version - error: compiling commit date` { t.Error(err) - } else if vers != "CGRateS@v0.10.1~dev" { + } else if vers != "CGRateS@v0.10.2~dev" { t.Errorf("Expecting: , received: <%s>", vers) } GitLastLog = `ommit 73014daa0c1d7edcb532d5fe600b8a20d588cdf8 @@ -1140,11 +1140,10 @@ Date: Fri Dec 30 19:48:09 2016 +0100 ` if vers, err := GetCGRVersion(); err == nil || err.Error() != "Cannot find commitHash or commitDate information" { t.Error(err) - } else if vers != "CGRateS@v0.10.1~dev" { + } else if vers != "CGRateS@v0.10.2~dev" { t.Errorf("Expecting: , received: <%s>", vers) } } -*/ func TestNewTenantID(t *testing.T) { eOut := &TenantID{ID: EmptyString}