From 9268d8a4edf0fe289012a873c584bfdc9a9c077e Mon Sep 17 00:00:00 2001 From: edwardro22 Date: Sun, 17 Sep 2017 09:44:46 +0000 Subject: [PATCH] Added the missing info --- cmd/cgr-migrator/cgr-migrator.go | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index c4521e167..89ddb75cc 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -23,20 +23,20 @@ import ( "fmt" "log" - "github.com/cgrates/cgrates/migrator" "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/migrator" "github.com/cgrates/cgrates/utils" ) var ( - oldDataDB migrator.V1DataDB - oldstorDB engine.Storage - oStorDBType string - odataDBType string + oldDataDB migrator.V1DataDB + oldstorDB engine.Storage + oStorDBType string + odataDBType string oDBDataEncoding string - migrate = flag.String("migrate", "", "Fire up automatic migration <*set_versions|*cost_details|*accounts|*actions|*action_triggers|*action_plans|*shared_groups>") - version = flag.Bool("version", false, "Prints the application version.") + migrate = flag.String("migrate", "", "Fire up automatic migration <*set_versions|*cost_details|*accounts|*actions|*action_triggers|*action_plans|*shared_groups>") + version = flag.Bool("version", false, "Prints the application version.") dataDBType = flag.String("datadb_type", config.CgrConfig().DataDbType, "The type of the DataDb database ") dataDBHost = flag.String("datadb_host", config.CgrConfig().DataDbHost, "The DataDb host to connect to.") @@ -45,7 +45,7 @@ var ( dataDBUser = flag.String("datadb_user", config.CgrConfig().DataDbUser, "The DataDb user to sign in as.") dataDBPass = flag.String("datadb_passwd", config.CgrConfig().DataDbPass, "The DataDb user's password.") - storDBType = flag.String("stordb_type", config.CgrConfig().StorDBType, "The type of the storDb database ") + storDBType = flag.String("stordb_type", config.CgrConfig().StorDBType, "The type of the storDb database ") storDBHost = flag.String("stordb_host", config.CgrConfig().StorDBHost, "The storDb host to connect to.") storDBPort = flag.String("stordb_port", config.CgrConfig().StorDBPort, "The storDb port to bind to.") storDBName = flag.String("stordb_name", config.CgrConfig().StorDBName, "The name/number of the storDb to connect to.") @@ -59,19 +59,19 @@ var ( oldDataDBUser = flag.String("old_datadb_user", config.CgrConfig().DataDbUser, "The DataDb user to sign in as.") oldDataDBPass = flag.String("old_datadb_passwd", config.CgrConfig().DataDbPass, "The DataDb user's password.") - oldStorDBType = flag.String("old_stordb_type", "", "The type of the storDb database ") + oldStorDBType = flag.String("old_stordb_type", "", "The type of the storDb database ") oldStorDBHost = flag.String("old_stordb_host", config.CgrConfig().StorDBHost, "The storDb host to connect to.") oldStorDBPort = flag.String("old_stordb_port", config.CgrConfig().StorDBPort, "The storDb port to bind to.") oldStorDBName = flag.String("old_stordb_name", config.CgrConfig().StorDBName, "The name/number of the storDb to connect to.") oldStorDBUser = flag.String("old_stordb_user", config.CgrConfig().StorDBUser, "The storDb user to sign in as.") oldStorDBPass = flag.String("old_stordb_passwd", config.CgrConfig().StorDBPass, "The storDb user's password.") - loadHistorySize = flag.Int("load_history_size", config.CgrConfig().LoadHistorySize, "Limit the number of records in the load history") + loadHistorySize = flag.Int("load_history_size", config.CgrConfig().LoadHistorySize, "Limit the number of records in the load history") oldLoadHistorySize = flag.Int("old_load_history_size", 0, "Limit the number of records in the load history") - dbDataEncoding = flag.String("dbdata_encoding", config.CgrConfig().DBDataEncoding, "The encoding used to store object data in strings") + dbDataEncoding = flag.String("dbdata_encoding", config.CgrConfig().DBDataEncoding, "The encoding used to store object data in strings") oldDBDataEncoding = flag.String("old_dbdata_encoding", "", "The encoding used to store object data in strings") - //TO DO: + //TO DO: //dryRun = flag.Bool("dry_run", false, "When true will not save loaded data to dataDb but just parse it for consistency and errors.") //verbose = flag.Bool("verbose", false, "Enable detailed verbose logging output") //slice mapstring int cate acc [0]am citit si [1]cate acc am scris @@ -85,47 +85,47 @@ func main() { fmt.Println(utils.GetCGRVersion()) return } -if migrate != nil && *migrate != "" { // Run migrator + if migrate != nil && *migrate != "" { // Run migrator dataDB, err := engine.ConfigureDataStorage(*dataDBType, *dataDBHost, *dataDBPort, *dataDBName, *dataDBUser, *dataDBPass, *dbDataEncoding, config.CgrConfig().CacheConfig, *loadHistorySize) if err != nil { log.Fatal(err) } storDB, err := engine.ConfigureStorStorage(*storDBType, *storDBHost, *storDBPort, *storDBName, *storDBUser, *storDBPass, *dbDataEncoding, - config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) + config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - if *oldDataDBType==""{ - *oldDataDBType=*dataDBType - *oldDataDBHost=*dataDBHost - *oldDataDBPort=*dataDBPort - *oldDataDBName=*dataDBName - *oldDataDBUser=*dataDBUser - *oldDataDBPass=*dataDBPass + if *oldDataDBType == "" { + *oldDataDBType = *dataDBType + *oldDataDBHost = *dataDBHost + *oldDataDBPort = *dataDBPort + *oldDataDBName = *dataDBName + *oldDataDBUser = *dataDBUser + *oldDataDBPass = *dataDBPass } oldDataDB, err := migrator.ConfigureV1DataStorage(*oldDataDBType, *oldDataDBHost, *dataDBPort, *dataDBName, *dataDBUser, *dataDBPass, *dbDataEncoding) if err != nil { log.Fatal(err) } - oldstorDB=storDB - if *oldStorDBType!="" { + oldstorDB = storDB + if *oldStorDBType != "" { oldstorDB, err = engine.ConfigureStorStorage(oStorDBType, *oldStorDBHost, *oldStorDBPort, *oldStorDBName, *oldStorDBUser, *oldStorDBPass, *oldDBDataEncoding, - config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) - if err != nil { - log.Fatal(err) + config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) + if err != nil { + log.Fatal(err) } } - m,err := migrator.NewMigrator(dataDB, *dataDBType, *dbDataEncoding, storDB, *storDBType, oldDataDB, *oldDataDBType,*oldDBDataEncoding,oldstorDB,*oldStorDBType) - if err != nil { - log.Fatal(err) - } - err = m.Migrate(*migrate); + m, err := migrator.NewMigrator(dataDB, *dataDBType, *dbDataEncoding, storDB, *storDBType, oldDataDB, *oldDataDBType, *oldDBDataEncoding, oldstorDB, *oldStorDBType) if err != nil { log.Fatal(err) } - + err = m.Migrate(*migrate) + if err != nil { + log.Fatal(err) + } + log.Print("Done migrating!") return }