From 018d8c7a2e79ca2b13e37cbfdd8480420eb73151 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Wed, 26 May 2021 09:47:08 +0300
Subject: [PATCH] Added back version flag

---
 cmd/cgr-console/cgr-console.go   |  2 +-
 cmd/cgr-engine/cgr-engine.go     |  2 +-
 cmd/cgr-loader/cgr-loader.go     |  2 +-
 cmd/cgr-migrator/cgr-migrator.go |  2 +-
 utils/consts.go                  | 33 ++++++++++++++++----------------
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/cmd/cgr-console/cgr-console.go b/cmd/cgr-console/cgr-console.go
index 39bb367f2..98feb200a 100644
--- a/cmd/cgr-console/cgr-console.go
+++ b/cmd/cgr-console/cgr-console.go
@@ -37,7 +37,7 @@ import (
 var (
 	cgrConsoleFlags = flag.NewFlagSet(utils.CgrConsole, flag.ContinueOnError)
 	historyFN       = os.Getenv(utils.HomeCgr) + utils.HistoryCgr
-	version         = cgrConsoleFlags.Bool(utils.ElsVersionLow, false, "Prints the application version.")
+	version         = cgrConsoleFlags.Bool(utils.VersionCgr, false, "Prints the application version.")
 	verbose         = cgrConsoleFlags.Bool(utils.VerboseCgr, false, "Show extra info about command execution.")
 	server          = cgrConsoleFlags.String(utils.MailerServerCfg, "127.0.0.1:2012", "server address host:port")
 	rpcEncoding     = cgrConsoleFlags.String(utils.RpcEncodingCgr, utils.MetaJSON, "RPC encoding used <*gob|*json>")
diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index b5acb971e..d06a5769c 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -50,7 +50,7 @@ import (
 var (
 	cgrEngineFlags    = flag.NewFlagSet(utils.CgrEngine, flag.ContinueOnError)
 	cfgPath           = cgrEngineFlags.String(utils.CfgPathCgr, utils.ConfigPath, "Configuration directory path.")
-	version           = cgrEngineFlags.Bool(utils.ElsVersionLow, false, "Prints the application version.")
+	version           = cgrEngineFlags.Bool(utils.VersionCgr, false, "Prints the application version.")
 	checkConfig       = cgrEngineFlags.Bool(utils.CheckCfgCgr, false, "Verify the config without starting the engine")
 	pidFile           = cgrEngineFlags.String(utils.PidCgr, utils.EmptyString, "Write pid file")
 	httpPprofPath     = cgrEngineFlags.String(utils.HttpPrfPthCgr, utils.EmptyString, "http address used for program profiling")
diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go
index 92005128a..53597d3cb 100644
--- a/cmd/cgr-loader/cgr-loader.go
+++ b/cmd/cgr-loader/cgr-loader.go
@@ -88,7 +88,7 @@ var (
 		"The tariff plan ID from the database")
 	dataPath = cgrLoaderFlags.String(utils.PathCfg, dfltCfg.LoaderCgrCfg().DataPath,
 		"The path to folder containing the data files")
-	version = cgrLoaderFlags.Bool(utils.ElsVersionLow, false,
+	version = cgrLoaderFlags.Bool(utils.VersionCgr, false,
 		"Prints the application version.")
 	verbose = cgrLoaderFlags.Bool(utils.VerboseCgr, false,
 		"Enable detailed verbose logging output")
diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go
index a2c3eaa28..42fa7aeca 100644
--- a/cmd/cgr-migrator/cgr-migrator.go
+++ b/cmd/cgr-migrator/cgr-migrator.go
@@ -47,7 +47,7 @@ var (
 
 	exec = cgrMigratorFlags.String(utils.ExecCgr, utils.EmptyString, "fire up automatic migration "+
 		"<*set_versions|*cost_details|*accounts|*actions|*action_triggers|*action_plans|*shared_groups|*filters|*stordb|*datadb>")
-	version = cgrMigratorFlags.Bool(utils.ElsVersionLow, false, "prints the application version")
+	version = cgrMigratorFlags.Bool(utils.VersionCgr, false, "prints the application version")
 
 	inDataDBType = cgrMigratorFlags.String(utils.DataDBTypeCgr, dfltCfg.DataDbCfg().Type,
 		"the type of the DataDB Database <*redis|*mongo>")
diff --git a/utils/consts.go b/utils/consts.go
index 6f499580c..95d6bf6cb 100644
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -2456,21 +2456,6 @@ const (
 	OptsRouteID = "*routeID"
 	// EEs
 	OptsEEsVerbose = "*eesVerbose"
-	// EEs Elasticsearch options
-	ElsIndex               = "elsIndex"
-	ElsIfPrimaryTerm       = "elsIfPrimaryTerm"
-	ElsIfSeqNo             = "elsIfSeqNo"
-	ElsOpType              = "elsOpType"
-	ElsPipeline            = "elsPipeline"
-	ElsRouting             = "elsRouting"
-	ElsTimeout             = "elsTimeout"
-	ElsVersionLow          = "elsVersion"
-	ElsVersionType         = "elsVersionType"
-	ElsWaitForActiveShards = "elsWaitForActiveShards"
-	// SQLEe options
-	SQLMaxOpenConns    = "sqlMaxOpenConns"
-	SQLMaxConnLifetime = "sqlMaxConnLifetime"
-
 	// Others
 	OptsContext               = "*context"
 	Subsys                    = "*subsys"
@@ -2533,8 +2518,6 @@ const (
 	SQSPoster = "SQSPoster"
 	S3Poster  = "S3Poster"
 
-	// for ers:
-
 	// General constants for posters and readers
 	DefaultQueueID = "cgrates_cdrs"
 	ProcessedOpt   = "Processed"
@@ -2559,6 +2542,9 @@ const (
 	SQLDBNameOpt    = "sqlDBName"
 	SQLTableNameOpt = "sqlTableName"
 
+	SQLMaxOpenConns    = "sqlMaxOpenConns"
+	SQLMaxConnLifetime = "sqlMaxConnLifetime"
+
 	// fileCSV
 	CSVRowLengthOpt     = "csvRowLength"
 	CSVFieldSepOpt      = "csvFieldSeparator"
@@ -2594,6 +2580,18 @@ const (
 	PartialCacheActionOpt      = "partialCacheAction"
 	PartialPathOpt             = "partialPath"
 	PartialCSVFieldSepartorOpt = "partialcsvFieldSeparator"
+
+	// EEs Elasticsearch options
+	ElsIndex               = "elsIndex"
+	ElsIfPrimaryTerm       = "elsIfPrimaryTerm"
+	ElsIfSeqNo             = "elsIfSeqNo"
+	ElsOpType              = "elsOpType"
+	ElsPipeline            = "elsPipeline"
+	ElsRouting             = "elsRouting"
+	ElsTimeout             = "elsTimeout"
+	ElsVersionLow          = "elsVersion"
+	ElsVersionType         = "elsVersionType"
+	ElsWaitForActiveShards = "elsWaitForActiveShards"
 )
 
 // Analyzers constants
@@ -2616,6 +2614,7 @@ const (
 const (
 	//Common
 	VerboseCgr      = "verbose"
+	VersionCgr      = "version"
 	QuitCgr         = "quit"
 	ExitCgr         = "exit"
 	ByeCgr          = "bye"