Skip to content

Commit

Permalink
Remove legacy config loading
Browse files Browse the repository at this point in the history
  • Loading branch information
Victor Castell committed Dec 23, 2018
1 parent 1614017 commit 5bd120f
Showing 1 changed file with 0 additions and 186 deletions.
186 changes: 0 additions & 186 deletions cmd/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ func init() {
}

func agentRun(args ...string) error {
legacyConfig()

// Make sure we clean up any managed plugins at the end of this
p := &Plugins{}
if err := p.DiscoverPlugins(); err != nil {
Expand Down Expand Up @@ -140,187 +138,3 @@ func handleReload() {
}
//Config reloading will also reload Notification settings
}

// Suport legacy config files for some time
func legacyConfig() {
s := viper.GetString("node_name")
if s != "" {
log.WithField("param", "node_name").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.NodeName = s
}

s = viper.GetString("bind_addr")
if s != "" {
log.WithField("param", "bind_addr").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.BindAddr = s
}

s = viper.GetString("http_addr")
if s != "" {
log.WithField("param", "http_addr").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.HTTPAddr = s
}

ss := viper.GetStringSlice("backend_machine")
if ss != nil {
log.WithField("param", "backend_machine").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.BackendMachines = ss
}

s = viper.GetString("advertise_addr")
if s != "" && viper.GetString("advertise-addr") == "" {
log.WithField("param", "advertise_addr").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.AdvertiseAddr = s
}

s = viper.GetString("snapshot_path")
if s != "" && viper.GetString("snapshot-path") == "" {
log.WithField("param", "snapshot_path").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.SnapshotPath = s
}

d := viper.GetDuration("reconnect_interval")
if d != 0 && viper.GetDuration("reconnect-interval") == 0 {
log.WithField("param", "reconnect_interval").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.ReconnectInterval = d
}

d = viper.GetDuration("reconnect_timeout")
if d != 0 && viper.GetDuration("reconnect-timeout") == 0 {
log.WithField("param", "reconnect_timeout").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.ReconnectTimeout = d
}

d = viper.GetDuration("tombstone_timeout")
if d != 0 && viper.GetDuration("tombstone-timeout") == 0 {
log.WithField("param", "tombstone_timeout").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.TombstoneTimeout = d
}

b := viper.GetBool("disable_name_resolution")
if b != false && viper.GetBool("disable-name-resolution") == false {
log.WithField("param", "disable_name_resolution").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.DisableNameResolution = b
}

s = viper.GetString("keyring_file")
if s != "" && viper.GetString("keyring-file") == "" {
log.WithField("param", "keyring_file").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.KeyringFile = s
}

b = viper.GetBool("rejoin_after_leave")
if b != false && viper.GetBool("rejoin-after-leave") == false {
log.WithField("param", "rejoin_after_leave").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.RejoinAfterLeave = b
}

s = viper.GetString("encrypt_key")
if s != "" && viper.GetString("encrypt-key") == "" {
log.WithField("param", "encrypt_key").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.EncryptKey = s
}

ss = viper.GetStringSlice("start_join")
if ss != nil && viper.GetStringSlice("start-join") == nil {
log.WithField("param", "start_join").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.StartJoin = ss
}

i := viper.GetInt("rpc_port")
if i != 0 {
log.WithField("param", "rpc_port").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.RPCPort = i
}

i = viper.GetInt("advertise_rpc_port")
if i != 0 && viper.GetInt("advertise-rpc-port") == 0 {
log.WithField("param", "advertise_rpc_port").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.AdvertiseRPCPort = i
}

s = viper.GetString("log_level")
if s != "" {
log.WithField("param", "log_level").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.LogLevel = s
}

s = viper.GetString("mail_host")
if s != "" && viper.GetString("mail-host") == "" {
log.WithField("param", "mail_host").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.MailHost = s
}

i = viper.GetInt("mail_port")
if i != 0 && viper.GetInt("mail-port") == 0 {
log.WithField("param", "mail_port").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.MailPort = uint16(i)
}

s = viper.GetString("mail_username")
if s != "" && viper.GetString("mail-username") == "" {
log.WithField("param", "mail_username").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.MailUsername = s
}

s = viper.GetString("mail_password")
if s != "" && viper.GetString("mail-password") == "" {
log.WithField("param", "mail_password").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.MailPassword = s
}

s = viper.GetString("mail_from")
if s != "" && viper.GetString("mail-from") == "" {
log.WithField("param", "mail_from").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.MailFrom = s
}

s = viper.GetString("mail_payload")
if s != "" && viper.GetString("mail-payload") == "" {
log.WithField("param", "mail_payload").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.MailPayload = s
}

s = viper.GetString("mail_subject_prefix")
if s != "" {
log.WithField("param", "mail_subject_prefix").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.MailSubjectPrefix = s
}

s = viper.GetString("webhook_url")
if s != "" && viper.GetString("webhook-url") == "" {
log.WithField("param", "webhook_url").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.WebhookURL = s
}

s = viper.GetString("webhook_payload")
if s != "" && viper.GetString("webhook-payload") == "" {
log.WithField("param", "webhook_payload").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.WebhookPayload = s
}

ss = viper.GetStringSlice("webhook_headers")
if ss != nil && viper.GetStringSlice("webhook-headers") == nil {
log.WithField("param", "webhook_headers").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.WebhookHeaders = ss
}

s = viper.GetString("dog_statsd_addr")
if s != "" && viper.GetString("dog-statsd-addr") == "" {
log.WithField("param", "dog_statsd_add").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.DogStatsdAddr = s
}

ss = viper.GetStringSlice("dog_statsd_tags")
if ss != nil && viper.GetStringSlice("dog-statsd-tags") == nil {
log.WithField("param", "dog_statsd_tags").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.DogStatsdTags = ss
}

s = viper.GetString("statsd_addr")
if s != "" && viper.GetString("statsd-addr") == "" {
log.WithField("param", "statsd_addr").Warn("Deprecation warning: Config param name is deprecated and will be removed in future versions.")
config.StatsdAddr = s
}

}

0 comments on commit 5bd120f

Please sign in to comment.