Merge pull request #3011 from alexquick/fix-config-restart-output
[config] forward output from plugn triggers to user
This commit is contained in:
2 files changed
+14
-8
No files matched your search
@@ -345,13 +345,12 @@ func VerifyImage(image string) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//PlugnTrigger fire the given plugn trigger with the given args
|
//PlugnTrigger fire the given plugn trigger with the given args
|
||||||
func PlugnTrigger(triggerName string, args ...string) (string, error) {
|
func PlugnTrigger(triggerName string, args ...string) error {
|
||||||
shellArgs := make([]interface{}, len(args)+2)
|
shellArgs := make([]interface{}, len(args)+2)
|
||||||
shellArgs[0] = "trigger"
|
shellArgs[0] = "trigger"
|
||||||
shellArgs[1] = triggerName
|
shellArgs[1] = triggerName
|
||||||
for i, arg := range args {
|
for i, arg := range args {
|
||||||
shellArgs[i+2] = arg
|
shellArgs[i+2] = arg
|
||||||
}
|
}
|
||||||
res, err := sh.Command("plugn", shellArgs...).Output()
|
return sh.Command("plugn", shellArgs...).Run()
|
||||||
return string(res), err
|
|
||||||
}
|
}
|
||||||
@@ -40,8 +40,7 @@ func SetMany(appName string, entries map[string]string, restart bool) (err error
|
|||||||
common.LogInfo1("Setting config vars")
|
common.LogInfo1("Setting config vars")
|
||||||
fmt.Println(prettyPrintEnvEntries(" ", entries))
|
fmt.Println(prettyPrintEnvEntries(" ", entries))
|
||||||
env.Write()
|
env.Write()
|
||||||
args := append([]string{appName, "set"}, keys...)
|
triggerUpdate(appName, "set", keys)
|
||||||
common.PlugnTrigger("post-config-update", args...)
|
|
||||||
}
|
}
|
||||||
if !global && restart && env.GetBoolDefault("DOKKU_APP_RESTORE", true) {
|
if !global && restart && env.GetBoolDefault("DOKKU_APP_RESTORE", true) {
|
||||||
triggerRestart(appName)
|
triggerRestart(appName)
|
||||||
@@ -64,8 +63,7 @@ func UnsetMany(appName string, keys []string, restart bool) (err error) {
|
|||||||
}
|
}
|
||||||
if changed {
|
if changed {
|
||||||
env.Write()
|
env.Write()
|
||||||
args := append([]string{appName, "unset"}, keys...)
|
triggerUpdate(appName, "unset", keys)
|
||||||
common.PlugnTrigger("post-config-update", args...)
|
|
||||||
}
|
}
|
||||||
if !global && restart && env.GetBoolDefault("DOKKU_APP_RESTORE", true) {
|
if !global && restart && env.GetBoolDefault("DOKKU_APP_RESTORE", true) {
|
||||||
triggerRestart(appName)
|
triggerRestart(appName)
|
||||||
@@ -75,7 +73,16 @@ func UnsetMany(appName string, keys []string, restart bool) (err error) {
|
|||||||
|
|
||||||
func triggerRestart(appName string) {
|
func triggerRestart(appName string) {
|
||||||
common.LogInfo1(fmt.Sprintf("Restarting app %s", appName))
|
common.LogInfo1(fmt.Sprintf("Restarting app %s", appName))
|
||||||
common.PlugnTrigger("app-restart", appName)
|
if err := common.PlugnTrigger("app-restart", appName); err != nil {
|
||||||
|
common.LogWarn(fmt.Sprintf("Failure while restarting app: %s", err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func triggerUpdate(appName string, operation string, args []string) {
|
||||||
|
args = append([]string{appName, operation}, args...)
|
||||||
|
if err := common.PlugnTrigger("post-config-update", args...); err != nil {
|
||||||
|
common.LogWarn(fmt.Sprintf("Failure while triggering post-config-update: %s", err))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadAppOrGlobalEnv(appName string) (env *Env, err error) {
|
func loadAppOrGlobalEnv(appName string) (env *Env, err error) {
|
||||||
|
|||||||
Reference in new issue
Block a user