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

fix: properly handle returned errors

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-02-17 20:42:29 -05:00
parent 2e774f0806
commit 7389bb3f03
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/buildpacks/src/triggers/triggers.go
View File

@@ -16,17 +16,18 @@ func main() {
trigger := parts[len(parts)-1] trigger := parts[len(parts)-1]
flag.Parse() flag.Parse()
var err error
switch trigger { switch trigger {
case "install": case "install":
buildpacks.TriggerInstall() buildpacks.TriggerInstall()
case "post-app-clone-setup": case "post-app-clone-setup":
oldAppName := flag.Arg(0) oldAppName := flag.Arg(0)
newAppName := flag.Arg(1) newAppName := flag.Arg(1)
buildpacks.TriggerPostAppCloneSetup(oldAppName, newAppName) err = buildpacks.TriggerPostAppCloneSetup(oldAppName, newAppName)
case "post-app-rename-setup": case "post-app-rename-setup":
oldAppName := flag.Arg(0) oldAppName := flag.Arg(0)
newAppName := flag.Arg(1) newAppName := flag.Arg(1)
buildpacks.TriggerPostAppRenameSetup(oldAppName, newAppName) err = buildpacks.TriggerPostAppRenameSetup(oldAppName, newAppName)
case "post-delete": case "post-delete":
appName := flag.Arg(0) appName := flag.Arg(0)
buildpacks.TriggerPostDelete(appName) buildpacks.TriggerPostDelete(appName)
@@ -40,4 +41,8 @@ func main() {
default: default:
common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger))
} }
if err != nil {
common.LogFail(err.Error())
}
} }

9
plugins/network/src/triggers/triggers.go
View File

@@ -16,6 +16,7 @@ func main() {
trigger := parts[len(parts)-1] trigger := parts[len(parts)-1]
flag.Parse() flag.Parse()
var err error
switch trigger { switch trigger {
case "install": case "install":
network.TriggerInstall() network.TriggerInstall()
@@ -63,11 +64,11 @@ func main() {
case "post-app-clone-setup": case "post-app-clone-setup":
oldAppName := flag.Arg(0) oldAppName := flag.Arg(0)
newAppName := flag.Arg(1) newAppName := flag.Arg(1)
network.TriggerPostAppCloneSetup(oldAppName, newAppName) err = network.TriggerPostAppCloneSetup(oldAppName, newAppName)
case "post-app-rename-setup": case "post-app-rename-setup":
oldAppName := flag.Arg(0) oldAppName := flag.Arg(0)
newAppName := flag.Arg(1) newAppName := flag.Arg(1)
network.TriggerPostAppRenameSetup(oldAppName, newAppName) err = network.TriggerPostAppRenameSetup(oldAppName, newAppName)
case "post-container-create": case "post-container-create":
containerType := flag.Arg(0) containerType := flag.Arg(0)
containerID := flag.Arg(1) containerID := flag.Arg(1)
@@ -90,4 +91,8 @@ func main() {
default: default:
common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger))
} }
if err != nil {
common.LogFail(err.Error())
}
} }

4
plugins/resource/src/triggers/triggers.go
View File

@@ -27,11 +27,11 @@ func main() {
case "post-app-clone-setup": case "post-app-clone-setup":
oldAppName := flag.Arg(0) oldAppName := flag.Arg(0)
newAppName := flag.Arg(1) newAppName := flag.Arg(1)
err := resource.TriggerPostAppCloneSetup(oldAppName, newAppName) err = resource.TriggerPostAppCloneSetup(oldAppName, newAppName)
case "post-app-rename-setup": case "post-app-rename-setup":
oldAppName := flag.Arg(0) oldAppName := flag.Arg(0)
newAppName := flag.Arg(1) newAppName := flag.Arg(1)
err := resource.TriggerPostAppRenameSetup(oldAppName, newAppName) err = resource.TriggerPostAppRenameSetup(oldAppName, newAppName)
case "post-delete": case "post-delete":
appName := flag.Arg(0) appName := flag.Arg(0)
err = resource.TriggerPostDelete(appName) err = resource.TriggerPostDelete(appName)