From 58ac1bfb2087e9e423e96816df8771de65894e62 Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Fri, 29 Sep 2023 10:20:34 +0800 Subject: [PATCH] DATABSE_MODE => STATEDIFF_MODE --- cmd/env.go | 4 ++-- cmd/root.go | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cmd/env.go b/cmd/env.go index fc30916..f214c1c 100644 --- a/cmd/env.go +++ b/cmd/env.go @@ -67,7 +67,7 @@ const ( DATABASE_USER = "DATABASE_USER" DATABASE_PASSWORD = "DATABASE_PASSWORD" - DATABASE_TYPE = "DATABASE_TYPE" + STATEDIFF_MODE = "STATEDIFF_MODE" DATABASE_DRIVER_TYPE = "DATABASE_DRIVER_TYPE" DATABASE_DUMP_DST = "DATABASE_DUMP_DST" DATABASE_FILE_PATH = "DATABASE_FILE_PATH" @@ -109,7 +109,6 @@ func init() { viper.BindEnv("database.connTimeout", DATABASE_CONN_TIMEOUT) viper.BindEnv("database.maxIdleTime", DATABASE_MAX_CONN_IDLE_TIME) - viper.BindEnv("database.type", DATABASE_TYPE) viper.BindEnv("database.driver", DATABASE_DRIVER_TYPE) viper.BindEnv("database.dumpDestination", DATABASE_DUMP_DST) viper.BindEnv("database.fileMode", DATABASE_FILE_MODE) @@ -130,6 +129,7 @@ func init() { viper.BindEnv("prom.httpPort", PROM_HTTP_PORT) viper.BindEnv("prom.dbStats", PROM_DB_STATS) + viper.BindEnv("statediff.mode", STATEDIFF_MODE) viper.BindEnv("statediff.serviceWorkers", STATEDIFF_SERVICE_WORKERS) viper.BindEnv("statediff.trieWorkers", STATEDIFF_TRIE_WORKERS) viper.BindEnv("statediff.workerQueueSize", STATEDIFF_WORKER_QUEUE_SIZE) diff --git a/cmd/root.go b/cmd/root.go index a755324..fb76f7f 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -294,14 +294,13 @@ func randSeq(n int) string { // getConfig constructs and returns the appropriate config from viper params func getConfig(nodeInfo node.Info) (interfaces.Config, error) { - dbTypeStr := viper.GetString("database.type") - dbType, err := shared.ResolveDBType(dbTypeStr) + outputMode, err := shared.ResolveDBType(viper.GetString("statediff.mode")) if err != nil { return nil, err } - logWithCommand.Debugf("Configuring service for database type: %s", dbType) + logWithCommand.Debugf("Configuring service for database type: %s", outputMode) var indexerConfig interfaces.Config - switch dbType { + switch outputMode { case shared.FILE: logWithCommand.Info("Starting in sql file writing mode") @@ -378,7 +377,7 @@ func getConfig(nodeInfo node.Info) (interfaces.Config, error) { } indexerConfig = pgConfig default: - return nil, fmt.Errorf("unrecognized db type: %s", dbType) + return nil, fmt.Errorf("unrecognized db type: %s", outputMode) } return indexerConfig, nil }