Skip to content

Commit 0578f93

Browse files
alexnrodostafen
authored andcommitted
fix: display actual config file path in startup logs
The 'Config file:' line in immudb startup logs always showed the hardcoded default value 'configs/immudb.toml' regardless of which config file was actually loaded via --config flag or IMMUDB_CONFIG env var. Signed-off-by: Alexander Rodionov <[email protected]>
1 parent 6ac516b commit 0578f93

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

cmd/immudb/command/init.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ func (cl *Commandline) setupFlags(cmd *cobra.Command, options *server.Options) {
4545
cmd.Flags().Bool("replication-skip-integrity-check", options.ReplicationOptions.SkipIntegrityCheck, "disable integrity check when reading data during replication")
4646
cmd.Flags().Bool("replication-wait-for-indexing", options.ReplicationOptions.WaitForIndexing, "wait for indexing to be up to date during replication")
4747
cmd.Flags().Int("max-active-databases", options.MaxActiveDatabases, "the maximum number of databases that can be active simultaneously")
48+
cmd.Flags().String("config", "", "config file (default path are configs or $HOME. Default filename is immudb.toml)")
4849

4950
cmd.PersistentFlags().StringVar(&cl.config.CfgFn, "config", "", "config file (default path are configs or $HOME. Default filename is immudb.toml)")
5051
cmd.Flags().String("pidfile", options.Pidfile, "pid path with filename e.g. /var/run/immudb.pid")
@@ -117,6 +118,7 @@ func (cl *Commandline) setupFlags(cmd *cobra.Command, options *server.Options) {
117118

118119
func setupDefaults(options *server.Options) {
119120
viper.SetDefault("dir", options.Dir)
121+
viper.SetDefault("config", options.Config)
120122
viper.SetDefault("port", options.Port)
121123
viper.SetDefault("address", options.Address)
122124
viper.SetDefault("replica", false)

cmd/immudb/command/parse_options.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
func parseOptions() (options *server.Options, err error) {
2626
dir := viper.GetString("dir")
27+
config := viper.GetString("config")
2728

2829
address := viper.GetString("address")
2930
port := viper.GetInt("port")
@@ -134,6 +135,7 @@ func parseOptions() (options *server.Options, err error) {
134135
options = server.
135136
DefaultOptions().
136137
WithDir(dir).
138+
WithConfig(config).
137139
WithPort(port).
138140
WithAddress(address).
139141
WithReplicationOptions(replicationOptions).

0 commit comments

Comments
 (0)