github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[config] stream output of app-restart & post-config-update plugn triggers to stdout/err

Browse Source
This commit is contained in:
Alex Quick
2017-12-16 11:32:06 -05:00
parent f8e3bdc56b
commit 5fbe28f672
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/common/common.go
View File

@@ -345,13 +345,12 @@ func VerifyImage(image string) bool {
}
//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[0] = "trigger"
shellArgs[1] = triggerName
for i, arg := range args {
shellArgs[i+2] = arg
}
res, err := sh.Command("plugn", shellArgs...).Output()
return string(res), err
return sh.Command("plugn", shellArgs...).Run()
}

10
plugins/config/config.go
View File

@@ -73,14 +73,16 @@ func UnsetMany(appName string, keys []string, restart bool) (err error) {
func triggerRestart(appName string) {
common.LogInfo1(fmt.Sprintf("Restarting app %s", appName))
output, _ := common.PlugnTrigger("app-restart", appName)
fmt.Printf(output)
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...)
output, _ := common.PlugnTrigger("post-config-update", args...)
fmt.Printf(output)
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) {