refactor: drop implicit returns
This commit is contained in:
1 parent
982895ff71
commit
3ab271f756
1 file changed
+18
-17
@@ -7,8 +7,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// CommandLimit implements resource:limit
|
// CommandLimit implements resource:limit
|
||||||
func CommandLimit(args []string, processType string, r Resource, global bool) (err error) {
|
func CommandLimit(args []string, processType string, r Resource, global bool) error {
|
||||||
appName, err = getAppName(args, global)
|
appName, err := getAppName(args, global)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -17,8 +17,8 @@ func CommandLimit(args []string, processType string, r Resource, global bool) (e
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CommandLimitClear implements resource:limit-clear
|
// CommandLimitClear implements resource:limit-clear
|
||||||
func CommandLimitClear(args []string, processType string, global bool) (err error) {
|
func CommandLimitClear(args []string, processType string, global bool) error {
|
||||||
appName, err = getAppName(args, global)
|
appName, err := getAppName(args, global)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -27,8 +27,8 @@ func CommandLimitClear(args []string, processType string, global bool) (err erro
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CommandReserve implements resource:reserve
|
// CommandReserve implements resource:reserve
|
||||||
func CommandReserve(args []string, processType string, r Resource, global bool) (err error) {
|
func CommandReserve(args []string, processType string, r Resource, global bool) error {
|
||||||
appName, err = getAppName(args, global)
|
appName, err := getAppName(args, global)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -38,7 +38,7 @@ func CommandReserve(args []string, processType string, r Resource, global bool)
|
|||||||
|
|
||||||
// CommandReserveClear implements resource:reserve-clear
|
// CommandReserveClear implements resource:reserve-clear
|
||||||
func CommandReserveClear(args []string, processType string, global bool) error {
|
func CommandReserveClear(args []string, processType string, global bool) error {
|
||||||
appName, err = getAppName(args, global)
|
appName, err := getAppName(args, global)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -73,7 +73,7 @@ func clearByRequestType(appName string, processType string, requestType string)
|
|||||||
|
|
||||||
for _, key := range resources {
|
for _, key := range resources {
|
||||||
property := propertyKey(processType, requestType, key)
|
property := propertyKey(processType, requestType, key)
|
||||||
err = common.PropertyDelete("resource", appName, property)
|
err := common.PropertyDelete("resource", appName, property)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -81,7 +81,7 @@ func clearByRequestType(appName string, processType string, requestType string)
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func setRequestType(appName string, processType string, r Resource, requestType string) (err error) {
|
func setRequestType(appName string, processType string, r Resource, requestType string) error {
|
||||||
if len(processType) == 0 {
|
if len(processType) == 0 {
|
||||||
processType = "_all_"
|
processType = "_all_"
|
||||||
}
|
}
|
||||||
@@ -103,7 +103,8 @@ func setRequestType(appName string, processType string, r Resource, requestType
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !hasValues {
|
if !hasValues {
|
||||||
return reportRequestType(appName, processType, requestType)
|
reportRequestType(appName, processType, requestType)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
noun := "limits"
|
noun := "limits"
|
||||||
@@ -126,16 +127,16 @@ func setRequestType(appName string, processType string, r Resource, requestType
|
|||||||
}
|
}
|
||||||
|
|
||||||
property := propertyKey(processType, requestType, key)
|
property := propertyKey(processType, requestType, key)
|
||||||
err = common.PropertyWrite("resource", appName, property, value)
|
err := common.PropertyWrite("resource", appName, property, value)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func reportRequestType(appName string, processType string, requestType string) (err error) {
|
func reportRequestType(appName string, processType string, requestType string) {
|
||||||
noun := "limits"
|
noun := "limits"
|
||||||
if requestType == "reserve" {
|
if requestType == "reserve" {
|
||||||
noun = "reservation"
|
noun = "reservation"
|
||||||
@@ -165,14 +166,14 @@ func reportRequestType(appName string, processType string, requestType string) (
|
|||||||
value := common.PropertyGet("resource", appName, property)
|
value := common.PropertyGet("resource", appName, property)
|
||||||
common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
|
common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
|
||||||
}
|
}
|
||||||
return nil
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func propertyKey(processType string, requestType string, key string) string {
|
func propertyKey(processType string, requestType string, key string) string {
|
||||||
return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
|
return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getAppName(args []string, global bool) (appName string, err error) {
|
func getAppName(args []string, global bool) (string, error) {
|
||||||
appName := "_all_"
|
appName := "_all_"
|
||||||
if global {
|
if global {
|
||||||
return appName, nil
|
return appName, nil
|
||||||
@@ -183,7 +184,7 @@ func getAppName(args []string, global bool) (appName string, err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
appName = args[0]
|
appName = args[0]
|
||||||
if err = common.VerifyAppName(appName); err != nil {
|
if err := common.VerifyAppName(appName); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user