From d09a7506df5c9412748673559b5c7099a3bc0cf7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 3 Feb 2021 04:29:57 -0500 Subject: [PATCH] refactor: bubble up error handling so that standard exit codes can be set at the top-level LogFail shouldn't be called internally if at all possible. --- plugins/app-json/functions.go | 6 +- plugins/app-json/src/triggers/triggers.go | 2 +- plugins/apps/src/subcommands/subcommands.go | 2 +- plugins/apps/src/triggers/triggers.go | 2 +- .../buildpacks/src/subcommands/subcommands.go | 2 +- plugins/buildpacks/src/triggers/triggers.go | 2 +- plugins/common/common.go | 10 ++- plugins/config/src/subcommands/subcommands.go | 2 +- plugins/config/src/triggers/triggers.go | 6 +- plugins/cron/src/subcommands/subcommands.go | 2 +- plugins/cron/src/triggers/triggers.go | 2 +- plugins/logs/src/subcommands/subcommands.go | 2 +- plugins/logs/src/triggers/triggers.go | 2 +- plugins/network/functions.go | 6 +- .../network/src/subcommands/subcommands.go | 2 +- plugins/network/src/triggers/triggers.go | 30 +++---- plugins/network/subcommands.go | 2 +- plugins/network/triggers.go | 87 ++++++++++++------- plugins/proxy/src/subcommands/subcommands.go | 2 +- plugins/proxy/src/triggers/triggers.go | 10 +-- plugins/ps/src/subcommands/subcommands.go | 2 +- plugins/ps/src/triggers/triggers.go | 2 +- plugins/repo/src/subcommands/subcommands.go | 2 +- plugins/repo/src/triggers/triggers.go | 2 +- .../resource/src/subcommands/subcommands.go | 2 +- plugins/resource/src/triggers/triggers.go | 2 +- 26 files changed, 113 insertions(+), 80 deletions(-) diff --git a/plugins/app-json/functions.go b/plugins/app-json/functions.go index a41071fdf..e70c5f281 100644 --- a/plugins/app-json/functions.go +++ b/plugins/app-json/functions.go @@ -245,14 +245,14 @@ func executeScript(appName string, image string, imageTag string, phase string) containerID, err := createdContainerID(appName, dockerArgs, image, script, phase) if err != nil { - common.LogFail(fmt.Sprintf("Failed to create %s execution container: %s", phase, err.Error())) + return fmt.Errorf("Failed to create %s execution container: %s", phase, err.Error()) } if !waitForExecution(containerID) { common.LogInfo2Quiet(fmt.Sprintf("Start of %s %s task (%s) output", appName, phaseName, containerID[0:9])) common.LogVerboseQuietContainerLogs(containerID) common.LogInfo2Quiet(fmt.Sprintf("End of %s %s task (%s) output", appName, phaseName, containerID[0:9])) - common.LogFail(fmt.Sprintf("Execution of %s task failed: %s", phase, phaseName)) + return fmt.Errorf("Execution of %s task failed: %s", phaseName, command) } common.LogInfo2Quiet(fmt.Sprintf("Start of %s %s task (%s) output", appName, phaseName, containerID[0:9])) @@ -292,7 +292,7 @@ func executeScript(appName string, image string, imageTag string, phase string) containerCommitCmd.ShowOutput = false containerCommitCmd.Command.Stderr = os.Stderr if !containerCommitCmd.Execute() { - common.LogFail(fmt.Sprintf("Commiting of '%s' to image failed: %s", phase, command)) + return fmt.Errorf("Commiting of '%s' to image failed: %s", phase, command) } return common.PlugnTrigger("scheduler-register-retired", []string{appName, containerID}...) diff --git a/plugins/app-json/src/triggers/triggers.go b/plugins/app-json/src/triggers/triggers.go index 5ef4cb5f5..c76f4c728 100644 --- a/plugins/app-json/src/triggers/triggers.go +++ b/plugins/app-json/src/triggers/triggers.go @@ -32,7 +32,7 @@ func main() { imageTag := flag.Arg(1) err = appjson.TriggerPreDeploy(appName, imageTag) default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/apps/src/subcommands/subcommands.go b/plugins/apps/src/subcommands/subcommands.go index 5b455660e..e8ba5eb84 100644 --- a/plugins/apps/src/subcommands/subcommands.go +++ b/plugins/apps/src/subcommands/subcommands.go @@ -78,7 +78,7 @@ func main() { appName := args.Arg(0) err = apps.CommandUnlock(appName) default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/apps/src/triggers/triggers.go b/plugins/apps/src/triggers/triggers.go index 7cb643f52..f0e6de8ea 100644 --- a/plugins/apps/src/triggers/triggers.go +++ b/plugins/apps/src/triggers/triggers.go @@ -37,7 +37,7 @@ func main() { appName := flag.Arg(0) err = apps.ReportSingleApp(appName, "", "") default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/buildpacks/src/subcommands/subcommands.go b/plugins/buildpacks/src/subcommands/subcommands.go index f86003c2e..94640f925 100644 --- a/plugins/buildpacks/src/subcommands/subcommands.go +++ b/plugins/buildpacks/src/subcommands/subcommands.go @@ -72,7 +72,7 @@ func main() { } err = buildpacks.CommandSetProperty(appName, property, value) default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/buildpacks/src/triggers/triggers.go b/plugins/buildpacks/src/triggers/triggers.go index c77498d6e..d9ff5d96b 100644 --- a/plugins/buildpacks/src/triggers/triggers.go +++ b/plugins/buildpacks/src/triggers/triggers.go @@ -42,7 +42,7 @@ func main() { appName := flag.Arg(0) err = buildpacks.ReportSingleApp(appName, "", "") default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/common/common.go b/plugins/common/common.go index 59c009e42..f390d6d8f 100644 --- a/plugins/common/common.go +++ b/plugins/common/common.go @@ -515,6 +515,14 @@ func isValidAppNameOld(appName string) error { return errors.New("App name must begin with lowercase alphanumeric character, and cannot include uppercase characters, or colons") } +type AppDoesNotExist struct { + appName string +} + +func (err *AppDoesNotExist) Error() string { + return fmt.Sprintf("App %s does not exist", err.appName) +} + // VerifyAppName checks if an app conforming to either the old or new // naming conventions exists func VerifyAppName(appName string) error { @@ -526,7 +534,7 @@ func VerifyAppName(appName string) error { appRoot := AppRoot(appName) if !DirectoryExists(appRoot) { - return fmt.Errorf("App %s does not exist", appName) + return &AppDoesNotExist{appName} } return nil diff --git a/plugins/config/src/subcommands/subcommands.go b/plugins/config/src/subcommands/subcommands.go index ae543e1ab..5598ed86a 100644 --- a/plugins/config/src/subcommands/subcommands.go +++ b/plugins/config/src/subcommands/subcommands.go @@ -105,7 +105,7 @@ func main() { keys := getKeys(args.Args(), *global) err = config.CommandUnset(appName, keys, *global, *noRestart) default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/config/src/triggers/triggers.go b/plugins/config/src/triggers/triggers.go index f55d80786..936cb30fb 100644 --- a/plugins/config/src/triggers/triggers.go +++ b/plugins/config/src/triggers/triggers.go @@ -27,12 +27,12 @@ func main() { case "config-get": appName := flag.Arg(0) key := flag.Arg(1) - config.TriggerConfigGet(appName, key) + err = config.TriggerConfigGet(appName, key) case "config-get-global": key := flag.Arg(0) - config.TriggerConfigGetGlobal(key) + err = config.TriggerConfigGetGlobal(key) default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/cron/src/subcommands/subcommands.go b/plugins/cron/src/subcommands/subcommands.go index 81a47e8ad..eb384b81e 100644 --- a/plugins/cron/src/subcommands/subcommands.go +++ b/plugins/cron/src/subcommands/subcommands.go @@ -33,7 +33,7 @@ func main() { err = cron.CommandReport(appName, *format, infoFlag) } default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/cron/src/triggers/triggers.go b/plugins/cron/src/triggers/triggers.go index f9a4d34ee..4733cba55 100644 --- a/plugins/cron/src/triggers/triggers.go +++ b/plugins/cron/src/triggers/triggers.go @@ -28,7 +28,7 @@ func main() { appName := flag.Arg(0) err = cron.ReportSingleApp(appName, "", "") default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/logs/src/subcommands/subcommands.go b/plugins/logs/src/subcommands/subcommands.go index c14b95039..dcc4f1704 100644 --- a/plugins/logs/src/subcommands/subcommands.go +++ b/plugins/logs/src/subcommands/subcommands.go @@ -62,7 +62,7 @@ func main() { args.Parse(os.Args[2:]) err = logs.CommandVectorStop() default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/logs/src/triggers/triggers.go b/plugins/logs/src/triggers/triggers.go index 7c9765e45..cba2d1d9a 100644 --- a/plugins/logs/src/triggers/triggers.go +++ b/plugins/logs/src/triggers/triggers.go @@ -34,7 +34,7 @@ func main() { appName := flag.Arg(0) err = logs.ReportSingleApp(appName, "", "") default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/network/functions.go b/plugins/network/functions.go index e07e02756..17d0ee8e8 100644 --- a/plugins/network/functions.go +++ b/plugins/network/functions.go @@ -12,7 +12,7 @@ import ( ) // attachAppToNetwork attaches a container to a network -func attachAppToNetwork(containerID string, networkName string, appName string, phase string, processType string) { +func attachAppToNetwork(containerID string, networkName string, appName string, phase string, processType string) error { cmdParts := []string{ common.DockerBin(), "network", @@ -50,8 +50,10 @@ func attachAppToNetwork(containerID string, networkName string, appName string, _, err := attachCmd.Output() if err != nil { err = errors.New(strings.TrimSpace(stderr.String())) - common.LogFail(fmt.Sprintf("Unable to attach container to network: %v", err.Error())) + return fmt.Errorf("Unable to attach container to network: %v", err.Error()) } + + return nil } // isConflictingPropertyValue returns true if the other attach property has a conflicting value diff --git a/plugins/network/src/subcommands/subcommands.go b/plugins/network/src/subcommands/subcommands.go index b3bbff98a..a79a54a79 100644 --- a/plugins/network/src/subcommands/subcommands.go +++ b/plugins/network/src/subcommands/subcommands.go @@ -68,7 +68,7 @@ func main() { value := args.Arg(2) err = network.CommandSet(appName, property, value) default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/network/src/triggers/triggers.go b/plugins/network/src/triggers/triggers.go index 140dad623..7ba918bf2 100644 --- a/plugins/network/src/triggers/triggers.go +++ b/plugins/network/src/triggers/triggers.go @@ -19,49 +19,49 @@ func main() { var err error switch trigger { case "install": - network.TriggerInstall() + err = network.TriggerInstall() case "network-build-config": appName := flag.Arg(0) - network.BuildConfig(appName) + err = network.BuildConfig(appName) case "network-compute-ports": appName := flag.Arg(0) processType := flag.Arg(1) isHerokuishContainer := common.ToBool(flag.Arg(2)) - network.TriggerNetworkComputePorts(appName, processType, isHerokuishContainer) + err = network.TriggerNetworkComputePorts(appName, processType, isHerokuishContainer) case "network-config-exists": appName := flag.Arg(0) - network.TriggerNetworkConfigExists(appName) + err = network.TriggerNetworkConfigExists(appName) case "network-get-ipaddr": appName := flag.Arg(0) processType := flag.Arg(1) containerID := flag.Arg(2) - network.TriggerNetworkGetIppaddr(appName, processType, containerID) + err = network.TriggerNetworkGetIppaddr(appName, processType, containerID) case "network-get-listeners": appName := flag.Arg(0) processType := flag.Arg(1) - network.TriggerNetworkGetListeners(appName, processType) + err = network.TriggerNetworkGetListeners(appName, processType) case "network-get-port": appName := flag.Arg(0) processType := flag.Arg(1) containerID := flag.Arg(2) isHerokuishContainer := common.ToBool(flag.Arg(3)) - network.TriggerNetworkGetPort(appName, processType, containerID, isHerokuishContainer) + err = network.TriggerNetworkGetPort(appName, processType, containerID, isHerokuishContainer) case "network-get-property": appName := flag.Arg(0) property := flag.Arg(1) - network.TriggerNetworkGetProperty(appName, property) + err = network.TriggerNetworkGetProperty(appName, property) case "network-write-ipaddr": appName := flag.Arg(0) processType := flag.Arg(1) containerIndex := flag.Arg(2) ip := flag.Arg(3) - network.TriggerNetworkWriteIpaddr(appName, processType, containerIndex, ip) + err = network.TriggerNetworkWriteIpaddr(appName, processType, containerIndex, ip) case "network-write-port": appName := flag.Arg(0) processType := flag.Arg(1) containerIndex := flag.Arg(2) port := flag.Arg(3) - network.TriggerNetworkWritePort(appName, processType, containerIndex, port) + err = network.TriggerNetworkWritePort(appName, processType, containerIndex, port) case "post-app-clone-setup": oldAppName := flag.Arg(0) newAppName := flag.Arg(1) @@ -76,21 +76,21 @@ func main() { appName := flag.Arg(2) phase := flag.Arg(3) processType := flag.Arg(4) - network.TriggerPostContainerCreate(containerType, containerID, appName, phase, processType) + err = network.TriggerPostContainerCreate(containerType, containerID, appName, phase, processType) case "post-create": appName := flag.Arg(0) - network.TriggerPostCreate(appName) + err = network.TriggerPostCreate(appName) case "post-delete": appName := flag.Arg(0) - network.TriggerPostDelete(appName) + err = network.TriggerPostDelete(appName) case "core-post-deploy": appName := flag.Arg(0) - network.TriggerCorePostDeploy(appName) + err = network.TriggerCorePostDeploy(appName) case "report": appName := flag.Arg(0) err = network.ReportSingleApp(appName, "", "") default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/network/subcommands.go b/plugins/network/subcommands.go index 8d5c2e7a0..0e9e7bbd3 100644 --- a/plugins/network/subcommands.go +++ b/plugins/network/subcommands.go @@ -79,7 +79,7 @@ func CommandExists(networkName string) error { if exists { common.LogInfo1Quiet("Network exists") } else { - common.LogFail("Network does not exist") + return errors.New("Network does not exist") } return nil diff --git a/plugins/network/triggers.go b/plugins/network/triggers.go index d0c28c02f..23b39bf02 100644 --- a/plugins/network/triggers.go +++ b/plugins/network/triggers.go @@ -11,15 +11,16 @@ import ( ) // TriggerInstall runs the install step for the network plugin -func TriggerInstall() { +func TriggerInstall() error { if err := common.PropertySetup("network"); err != nil { - common.LogFail(fmt.Sprintf("Unable to install the network plugin: %s", err.Error())) + return fmt.Errorf("Unable to install the network plugin: %s", err.Error()) } apps, err := common.DokkuApps() if err != nil { - return + return nil } + for _, appName := range apps { if common.PropertyExists("network", appName, "bind-all-interfaces") { continue @@ -36,10 +37,12 @@ func TriggerInstall() { } } } + + return nil } // TriggerNetworkComputePorts computes the ports for a given app container -func TriggerNetworkComputePorts(appName string, processType string, isHerokuishContainer bool) { +func TriggerNetworkComputePorts(appName string, processType string, isHerokuishContainer bool) error { var dockerfilePorts []string if !isHerokuishContainer { dokkuDockerfilePorts := strings.Trim(config.GetWithDefault(appName, "DOKKU_DOCKERFILE_PORTS", ""), " ") @@ -60,80 +63,91 @@ func TriggerNetworkComputePorts(appName string, processType string, isHerokuishC ports = append(ports, port) } } + fmt.Println(strings.Join(ports, " ")) + return nil } // TriggerNetworkConfigExists writes true or false to stdout whether a given app has network config -func TriggerNetworkConfigExists(appName string) { +func TriggerNetworkConfigExists(appName string) error { if HasNetworkConfig(appName) { fmt.Println("true") - return + return nil } fmt.Println("false") + return nil } // TriggerNetworkGetIppaddr writes the ipaddress to stdout for a given app container -func TriggerNetworkGetIppaddr(appName string, processType string, containerID string) { +func TriggerNetworkGetIppaddr(appName string, processType string, containerID string) error { ipAddress := GetContainerIpaddress(appName, processType, containerID) fmt.Println(ipAddress) + return nil } // TriggerNetworkGetListeners returns the listeners (host:port combinations) for a given app container -func TriggerNetworkGetListeners(appName string, processType string) { +func TriggerNetworkGetListeners(appName string, processType string) error { if processType == "" { common.LogWarn("Deprecated: Please specify a processType argument for the network-get-listeners plugin trigger") processType = "web" } listeners := GetListeners(appName, processType) fmt.Println(strings.Join(listeners, " ")) + return nil } // TriggerNetworkGetPort writes the port to stdout for a given app container -func TriggerNetworkGetPort(appName string, processType string, containerID string, isHerokuishContainer bool) { +func TriggerNetworkGetPort(appName string, processType string, containerID string, isHerokuishContainer bool) error { port := GetContainerPort(appName, processType, containerID, isHerokuishContainer) fmt.Println(port) + return nil } // TriggerNetworkGetProperty writes the network property to stdout for a given app container -func TriggerNetworkGetProperty(appName string, property string) { +func TriggerNetworkGetProperty(appName string, property string) error { defaultValue := GetDefaultValue(property) value := common.PropertyGetDefault("network", appName, property, defaultValue) fmt.Println(value) + return nil } // TriggerNetworkWriteIpaddr writes the ip to disk -func TriggerNetworkWriteIpaddr(appName string, processType string, containerIndex string, ip string) { +func TriggerNetworkWriteIpaddr(appName string, processType string, containerIndex string, ip string) error { appRoot := common.AppRoot(appName) filename := fmt.Sprintf("%v/IP.%v.%v", appRoot, processType, containerIndex) f, err := os.Create(filename) if err != nil { - common.LogFail(err.Error()) + return err } defer f.Close() ipBytes := []byte(ip) _, err = f.Write(ipBytes) if err != nil { - common.LogFail(err.Error()) + return err } + + return nil } // TriggerNetworkWritePort writes the port to disk -func TriggerNetworkWritePort(appName string, processType string, containerIndex string, port string) { +func TriggerNetworkWritePort(appName string, processType string, containerIndex string, port string) error { appRoot := common.AppRoot(appName) filename := fmt.Sprintf("%v/PORT.%v.%v", appRoot, processType, containerIndex) f, err := os.Create(filename) if err != nil { - common.LogFail(err.Error()) + return err } defer f.Close() portBytes := []byte(port) _, err = f.Write(portBytes) if err != nil { - common.LogFail(err.Error()) + return err } + + return nil } // TriggerPostAppCloneSetup creates new network files @@ -170,75 +184,84 @@ func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error { } // TriggerPostContainerCreate associates the container with a specified network -func TriggerPostContainerCreate(containerType string, containerID string, appName string, phase string, processType string) { +func TriggerPostContainerCreate(containerType string, containerID string, appName string, phase string, processType string) error { if containerType != "app" { - return + return nil + } property := "attach-post-create" defaultValue := GetDefaultValue(property) networkName := common.PropertyGetDefault("network", appName, property, defaultValue) if networkName == "" { - return + return nil + } exists, err := networkExists(networkName) if err != nil { - common.LogFail(err.Error()) + return err } if !exists { - common.LogFail(fmt.Sprintf("Network %v does not exist", networkName)) + return fmt.Errorf("Network %v does not exist", networkName) } - attachAppToNetwork(containerID, networkName, appName, phase, processType) + return attachAppToNetwork(containerID, networkName, appName, phase, processType) } // TriggerPostCreate sets bind-all-interfaces to false by default -func TriggerPostCreate(appName string) { +func TriggerPostCreate(appName string) error { err := common.PropertyWrite("network", appName, "bind-all-interfaces", "false") if err != nil { common.LogWarn(err.Error()) } + + return nil } // TriggerPostDelete destroys the network property for a given app container -func TriggerPostDelete(appName string) { +func TriggerPostDelete(appName string) error { err := common.PropertyDestroy("network", appName) if err != nil { - common.LogFail(err.Error()) + return err } + + return nil } // TriggerCorePostDeploy associates the container with a specified network -func TriggerCorePostDeploy(appName string) { +func TriggerCorePostDeploy(appName string) error { property := "attach-post-deploy" defaultValue := GetDefaultValue(property) networkName := common.PropertyGetDefault("network", appName, property, defaultValue) if networkName == "" { - return + return nil } common.LogInfo1Quiet(fmt.Sprintf("Associating app with network %s", networkName)) containerIDs, err := common.GetAppRunningContainerIDs(appName, "") if err != nil { - common.LogFail(err.Error()) + return err } exists, err := networkExists(networkName) if err != nil { - common.LogFail(err.Error()) + return err } if !exists { - common.LogFail(fmt.Sprintf("Network %v does not exist", networkName)) + return fmt.Errorf("Network %v does not exist", networkName) } for _, containerID := range containerIDs { processType, err := common.DockerInspect(containerID, "{{ index .Config.Labels \"com.dokku.process-type\"}}") if err != nil { - common.LogFail(err.Error()) + return err + } + if err := attachAppToNetwork(containerID, networkName, appName, "deploy", processType); err != nil { + return err } - attachAppToNetwork(containerID, networkName, appName, "deploy", processType) } + return nil } diff --git a/plugins/proxy/src/subcommands/subcommands.go b/plugins/proxy/src/subcommands/subcommands.go index 25405964a..9bba1b38c 100644 --- a/plugins/proxy/src/subcommands/subcommands.go +++ b/plugins/proxy/src/subcommands/subcommands.go @@ -83,7 +83,7 @@ func main() { proxyType := args.Arg(1) err = proxy.CommandSet(appName, proxyType) default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/proxy/src/triggers/triggers.go b/plugins/proxy/src/triggers/triggers.go index 33bd2ea42..956fcf91d 100644 --- a/plugins/proxy/src/triggers/triggers.go +++ b/plugins/proxy/src/triggers/triggers.go @@ -20,21 +20,21 @@ func main() { switch trigger { case "proxy-is-enabled": appName := flag.Arg(0) - proxy.TriggerProxyIsEnabled(appName) + err = proxy.TriggerProxyIsEnabled(appName) case "proxy-type": appName := flag.Arg(0) - proxy.TriggerProxyType(appName) + err = proxy.TriggerProxyType(appName) case "post-certs-remove": appName := flag.Arg(0) - proxy.TriggerPostCertsRemove(appName) + err = proxy.TriggerPostCertsRemove(appName) case "post-certs-update": appName := flag.Arg(0) - proxy.TriggerPostCertsUpdate(appName) + err = proxy.TriggerPostCertsUpdate(appName) case "report": appName := flag.Arg(0) err = proxy.ReportSingleApp(appName, "", "") default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/ps/src/subcommands/subcommands.go b/plugins/ps/src/subcommands/subcommands.go index df8fb3a26..e1d8b7378 100644 --- a/plugins/ps/src/subcommands/subcommands.go +++ b/plugins/ps/src/subcommands/subcommands.go @@ -86,7 +86,7 @@ func main() { appName := args.Arg(0) err = ps.CommandStop(appName, *allApps, *parallelCount) default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/ps/src/triggers/triggers.go b/plugins/ps/src/triggers/triggers.go index 9c61a9d44..3b51e1214 100644 --- a/plugins/ps/src/triggers/triggers.go +++ b/plugins/ps/src/triggers/triggers.go @@ -75,7 +75,7 @@ func main() { appName := flag.Arg(0) err = ps.ReportSingleApp(appName, "", "") default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/repo/src/subcommands/subcommands.go b/plugins/repo/src/subcommands/subcommands.go index 9e46455d7..c173860f7 100644 --- a/plugins/repo/src/subcommands/subcommands.go +++ b/plugins/repo/src/subcommands/subcommands.go @@ -29,7 +29,7 @@ func main() { appName := args.Arg(0) err = repo.CommandPurgeCache(appName) default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/repo/src/triggers/triggers.go b/plugins/repo/src/triggers/triggers.go index 8e170f1a6..1abc176d4 100644 --- a/plugins/repo/src/triggers/triggers.go +++ b/plugins/repo/src/triggers/triggers.go @@ -25,7 +25,7 @@ func main() { appName := flag.Arg(0) err = repo.PurgeCache(appName) default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil { diff --git a/plugins/resource/src/subcommands/subcommands.go b/plugins/resource/src/subcommands/subcommands.go index 0d472f81f..e8f61d2fc 100644 --- a/plugins/resource/src/subcommands/subcommands.go +++ b/plugins/resource/src/subcommands/subcommands.go @@ -88,7 +88,7 @@ func main() { appName := args.Arg(0) err = resource.CommandReserveClear(appName, *processType) default: - common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) + err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) } if err != nil { diff --git a/plugins/resource/src/triggers/triggers.go b/plugins/resource/src/triggers/triggers.go index d835c78a9..a0d461fa0 100644 --- a/plugins/resource/src/triggers/triggers.go +++ b/plugins/resource/src/triggers/triggers.go @@ -45,7 +45,7 @@ func main() { key := flag.Arg(3) err = resource.TriggerResourceGetProperty(appName, processType, resourceType, key) default: - common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) + err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) } if err != nil {