Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: clean up duplication in retrieving and verifying the APP argument

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2019-03-14 12:37:33 -04:00
parent c5717510ee
commit ab9f516c08
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
plugins/resource/subcommands.go
View File

@@ -8,16 +8,9 @@ import (
// CommandLimit implements resource:limit
func CommandLimit(args []string, processType string, r Resource, global bool) (err error) {
appName := "_all_"
if !global {
appName, err = getAppName(args)
if err != nil {
return
}
if err = common.VerifyAppName(appName); err != nil {
common.LogFail(err.Error())
}
appName, err = getAppName(args, global)
if err != nil {
return err
}
return setRequestType(appName, processType, r, "limit")
@@ -30,16 +23,9 @@ func CommandLimitClear(args []string, processType string, global bool) (err erro
// CommandReserve implements resource:reserve
func CommandReserve(args []string, processType string, r Resource, global bool) (err error) {
appName := "_all_"
if !global {
appName, err = getAppName(args)
if err != nil {
return
}
if err = common.VerifyAppName(appName); err != nil {
common.LogFail(err.Error())
}
appName, err = getAppName(args, global)
if err != nil {
return err
}
return setRequestType(appName, processType, r, "reserve")
@@ -141,12 +127,20 @@ func propertyKey(processType string, requestType string, key string) string {
return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
}
func getAppName(args []string) (appName string, err error) {
if len(args) >= 1 {
appName = args[0]
} else {
err = errors.New("Please specify an app to run the command on")
func getAppName(args []string, global bool) (appName string, err error) {
appName := "_all_"
if global {
return appName, nil
}
return
if len(args) < 1 {
return "", errors.New("Please specify an app to run the command on")
}
appName = args[0]
if err = common.VerifyAppName(appName); err != nil {
return "", err
}
return appName, nil
}