remove --quiet, --debug and --verbose

config.go

@@ -26,7 +26,6 @@ var (
  clientKey string
  confdir string
  config Config // holds the global confd config.
- debug bool
  interval int
  keepStageFile bool
  logLevel string
@@ -35,12 +34,10 @@ var (
  onetime bool
  prefix string
  printVersion bool
- quiet bool
  scheme string
  srvDomain string
  templateConfig template.Config
  backendsConfig backends.Config
- verbose bool
  watch bool
 )
 
@@ -52,14 +49,11 @@ type Config struct {
  ClientCert string `toml:"client_cert"`
  ClientKey string `toml:"client_key"`
  ConfDir string `toml:"confdir"`
- Debug bool `toml:"debug"`
  Interval int `toml:"interval"`
  Noop bool `toml:"noop"`
  Prefix string `toml:"prefix"`
- Quiet bool `toml:"quiet"`
  SRVDomain string `toml:"srv_domain"`
  Scheme string `toml:"scheme"`
- Verbose bool `toml:"verbose"`
  LogLevel string `toml:"log-level"`
  Watch bool `toml:"watch"`
 }
@@ -71,7 +65,6 @@ func init() {
  flag.StringVar(&clientKey, "client-key", "", "the client key")
  flag.StringVar(&confdir, "confdir", "/etc/confd", "confd conf directory")
  flag.StringVar(&configFile, "config-file", "", "the confd config file")
- flag.BoolVar(&debug, "debug", false, "enable debug logging")
  flag.IntVar(&interval, "interval", 600, "backend polling interval")
  flag.BoolVar(&keepStageFile, "keep-stage-file", false, "keep staged files")
  flag.StringVar(&logLevel, "log-level", "", "level which confd should log messages")
@@ -80,10 +73,8 @@ func init() {
  flag.BoolVar(&onetime, "onetime", false, "run once and exit")
  flag.StringVar(&prefix, "prefix", "/", "key path prefix")
  flag.BoolVar(&printVersion, "version", false, "print version and exit")
- flag.BoolVar(&quiet, "quiet", false, "enable quiet logging")
  flag.StringVar(&scheme, "scheme", "http", "the backend URI scheme (http or https)")
  flag.StringVar(&srvDomain, "srv-domain", "", "the name of the resource record")
- flag.BoolVar(&verbose, "verbose", false, "enable verbose logging")
  flag.BoolVar(&watch, "watch", false, "enable watch support")
 }
 
@@ -122,16 +113,6 @@ func initConfig() error {
  // Update config from commandline flags.
  processFlags()
 
- // Configure logging.
- if config.Quiet {
- log.SetQuiet()
- }
- if config.Verbose {
- log.SetVerbose()
- }
- if config.Debug {
- log.SetDebug()
- }
  if config.LogLevel != "" {
  log.SetLevel(config.LogLevel)
  }
@@ -220,8 +201,6 @@ func setConfigFromFlag(f *flag.Flag) {
  switch f.Name {
  case "backend":
  config.Backend = backend
- case "debug":
- config.Debug = debug
  case "client-cert":
  config.ClientCert = clientCert
  case "client-key":
@@ -238,14 +217,10 @@ func setConfigFromFlag(f *flag.Flag) {
  config.Noop = noop
  case "prefix":
  config.Prefix = prefix
- case "quiet":
- config.Quiet = quiet
  case "scheme":
  config.Scheme = scheme
  case "srv-domain":
  config.SRVDomain = srvDomain
- case "verbose":
- config.Verbose = verbose
  case "log-level":
  config.LogLevel = logLevel
  case "watch":

config_test.go

@@ -16,14 +16,11 @@ func TestInitConfigDefaultConfig(t *testing.T) {
  ClientCert: "",
  ClientKey: "",
  ConfDir: "/etc/confd",
- Debug: false,
  Interval: 600,
  Noop: false,
  Prefix: "/",
- Quiet: false,
  SRVDomain: "",
  Scheme: "http",
- Verbose: false,
  }
  if err := initConfig(); err != nil {
  t.Errorf(err.Error())

docs/command-line-flags.md

@@ -14,17 +14,15 @@ Usage of confd:
  -client-key="": the client key
  -confdir="/etc/confd": confd conf directory
  -config-file="": the confd config file
- -debug=false: enable debug logging
  -interval=600: backend polling interval
  -keep-stage-file=false: keep staged files
+ -log-level="": level which confd should log messages
  -node=[]: list of backend nodes
  -noop=false: only show pending changes
  -onetime=false: run once and exit
  -prefix="/": key path prefix
- -quiet=false: enable quiet logging
  -scheme="http": the backend URI scheme (http or https)
  -srv-domain="": the name of the resource record
- -verbose=false: enable verbose logging
  -version=false: print version and exit
  -watch=false: enable watch support
 ```

docs/configuration-guide.md

@@ -12,15 +12,13 @@ Optional:
 * `client_cert` (string) - The client cert file.
 * `client_key` (string) - The client key file.
 * `confdir` (string) - The path to confd configs. ("/etc/confd")
-* `debug` (bool) - Enable debug logging.
 * `interval` (int) - The backend polling interval in seconds. (600)
+* `log-level` (string) - level which confd should log messages ("info")
 * `nodes` (array of strings) - List of backend nodes. (["http://127.0.0.1:4001"])
 * `noop` (bool) - Enable noop mode. Process all template resources; skip target update.
 * `prefix` (string) - The string to prefix to keys. ("/")
-* `quiet` (bool) - Enable quiet logging.
 * `scheme` (string) - The backend URI scheme. ("http" or "https")
 * `srv_domain` (string) - The name of the resource record.
-* `verbose` (bool) - Enable verbose logging.
 * `watch` (bool) - Enable watch support.
 
 Example:
@@ -30,15 +28,13 @@ backend = "etcd"
 client_cert = "/etc/confd/ssl/client.crt"
 client_key = "/etc/confd/ssl/client.key"
 confdir = "/etc/confd"
-debug = false
+log-level = "debug"
 interval = 600
 nodes = [
  "http://127.0.0.1:4001",
 ]
 noop = false
 prefix = "/production"
-quiet = false
 scheme = "https"
 srv_domain = "etcd.example.com"
-verbose = false
 ```

docs/noop-mode.md

@@ -19,7 +19,7 @@ noop = true
 ### Example
 
 ```
-confd -onetime -noop -verbose
+confd -onetime -noop
 ```
 
 -

log/log.go

@@ -39,27 +39,7 @@ func SetTag(t string) {
  tag = t
 }
 
-// SetQuiet sets quiet mode.
-//
-// TODO (bacongobbler): remove entirely once v0.9.0 lands
-func SetQuiet() {
- Fatal("--quiet has been deprecated in favour of --log-level")
-}
-
-// SetDebug sets debug mode.
-//
-// TODO (bacongobbler): remove entirely once v0.9.0 lands
-func SetDebug() {
- Fatal("--debug has been deprecated in favour of --log-level")
-}
-
-// SetVerbose sets verbose mode.
-//
-// TODO (bacongobbler): remove entirely once v0.9.0 lands
-func SetVerbose() {
- Fatal("--verbose has been deprecated in favour of --log-level")
-}
-
+// SetLevel sets the log level. Valid levels are panic, fatal, error, warn, info and debug.
 func SetLevel(level string) {
  lvl, err := log.ParseLevel(level)
  if err != nil {