7568a19433
This patch refactors the commands that use the mitchellh/cli library to populate the command line flag set in both the Run() and the Help() method. Earlier versions of the mitchellh/cli library relied on the Run() method to populuate the flagset for generating the usage screen. This has changed in later versions and was previously solved with a small monkey patch to the library to restore the old behavior. However, this makes upgrading the library difficult since the patch has to be restored every time. This patch addresses this by moving the command line flags into an initFlags() method where appropriate and also moving all variables for the flags from the Run() method into the command itself. Fixes #3536
48 lines
955 B
Go
48 lines
955 B
Go
package command
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
// ReloadCommand is a Command implementation that instructs
|
|
// the Consul agent to reload configurations
|
|
type ReloadCommand struct {
|
|
BaseCommand
|
|
}
|
|
|
|
func (c *ReloadCommand) Help() string {
|
|
c.InitFlagSet()
|
|
return c.HelpCommand(`
|
|
Usage: consul reload
|
|
|
|
Causes the agent to reload configurations. This can be used instead
|
|
of sending the SIGHUP signal to the agent.
|
|
|
|
`)
|
|
}
|
|
|
|
func (c *ReloadCommand) Run(args []string) int {
|
|
c.InitFlagSet()
|
|
if err := c.FlagSet.Parse(args); err != nil {
|
|
return 1
|
|
}
|
|
|
|
client, err := c.HTTPClient()
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
|
|
return 1
|
|
}
|
|
|
|
if err := client.Agent().Reload(); err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error reloading: %s", err))
|
|
return 1
|
|
}
|
|
|
|
c.UI.Output("Configuration reload triggered")
|
|
return 0
|
|
}
|
|
|
|
func (c *ReloadCommand) Synopsis() string {
|
|
return "Triggers the agent to reload configuration files"
|
|
}
|