[config] forward output from plugn triggers to user

This commit is contained in:
Alex Quick committed 2017-12-15 09:37:28 -05:00
1 parent 4bb221d89a
commit f8e3bdc56b
1 file changed
+10 -5
+10 -5
View File
@@ -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,14 @@ 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) output, _ := common.PlugnTrigger("app-restart", appName)
fmt.Printf(output)
}
func triggerUpdate(appName string, operation string, args []string) {
args = append([]string{appName, operation}, args...)
output, _ := common.PlugnTrigger("post-config-update", args...)
fmt.Printf(output)
} }
func loadAppOrGlobalEnv(appName string) (env *Env, err error) { func loadAppOrGlobalEnv(appName string) (env *Env, err error) {