cerc-io/ipld-eth-server
18
0
Fork 1
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases 37 Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Ilnur Galiev 2020-10-19 16:20:05 +03:00
parent 2d15e8c2f1
commit b1f00c5776
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/root.go
View File

@ -109,15 +109,9 @@ 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"))