Metrics and http server #15

Merged
n0cte merged 10 commits from metrics into master 2020-10-21 16:42:05 +00:00
Showing only changes of commit b1f00c5776 - Show all commits

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"))