forked from cerc-io/ipld-eth-server
Merge branch 'metrics' of https://github.com/n0cte/ipld-eth-server into metrics
This commit is contained in:
commit
2d15e8c2f1
@ -109,9 +109,15 @@ func init() {
|
|||||||
|
|
||||||
rootCmd.PersistentFlags().Bool("metrics", false, "enable metrics")
|
rootCmd.PersistentFlags().Bool("metrics", false, "enable metrics")
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
rootCmd.PersistentFlags().Bool("http", false, "enable http service for prometheus")
|
rootCmd.PersistentFlags().Bool("http", false, "enable http service for prometheus")
|
||||||
rootCmd.PersistentFlags().String("http-addr", "127.0.0.1", "http host for prometheus")
|
rootCmd.PersistentFlags().String("http-addr", "127.0.0.1", "http host for prometheus")
|
||||||
rootCmd.PersistentFlags().String("http-port", "8080", "http port for prometheus")
|
rootCmd.PersistentFlags().String("http-port", "8080", "http port for prometheus")
|
||||||
|
=======
|
||||||
|
rootCmd.PersistentFlags().Bool("http", false, "enable http service")
|
||||||
|
rootCmd.PersistentFlags().String("http-addr", "127.0.0.1", "http host")
|
||||||
|
rootCmd.PersistentFlags().String("http-port", "8080", "http port")
|
||||||
|
>>>>>>> efebea7a186d6b78f7808210545f4b3565796934
|
||||||
|
|
||||||
viper.BindPFlag("logfile", rootCmd.PersistentFlags().Lookup("logfile"))
|
viper.BindPFlag("logfile", rootCmd.PersistentFlags().Lookup("logfile"))
|
||||||
viper.BindPFlag("database.name", rootCmd.PersistentFlags().Lookup("database-name"))
|
viper.BindPFlag("database.name", rootCmd.PersistentFlags().Lookup("database-name"))
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[database]
|
[database]
|
||||||
name = "vulcanize_public" # $DATABASE_NAME
|
name = "vulcanize_public1" # $DATABASE_NAME
|
||||||
hostname = "localhost" # $DATABASE_HOSTNAME
|
hostname = "localhost" # $DATABASE_HOSTNAME
|
||||||
port = 5432 # $DATABASE_PORT
|
port = 5432 # $DATABASE_PORT
|
||||||
user = "postgres" # $DATABASE_USER
|
user = "postgres" # $DATABASE_USER
|
||||||
|
Loading…
Reference in New Issue
Block a user