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

feat: override all existing scale parameters when calling ps-set-scale

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-08-01 16:20:19 -04:00
parent 5ad5a29a00
commit ef262c26e8
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/ps/functions.go
View File

@@ -62,11 +62,11 @@ func extractOrGenerateScalefile(appName string, image string) error {
if common.FileExists(destination) {
common.LogInfo1Quiet("DOKKU_SCALE file exists")
return updateScalefile(appName, make(map[string]int))
return updateScalefile(appName, false, make(map[string]int))
}
common.LogInfo1Quiet("DOKKU_SCALE file not found in app image. Generating one based on Procfile...")
if err := updateScalefile(appName, make(map[string]int)); err != nil {
if err := updateScalefile(appName, false, make(map[string]int)); err != nil {
common.LogDebug(fmt.Sprintf("Error generating scale file: %s", err.Error()))
return err
}
@@ -380,14 +380,14 @@ func scaleReport(appName string) error {
return nil
}
func scaleSet(appName string, skipDeploy bool, processTuples []string) error {
func scaleSet(appName string, skipDeploy bool, clearExisting bool, processTuples []string) error {
scale, err := parseProcessTuples(processTuples)
if err != nil {
return err
}
common.LogInfo1(fmt.Sprintf("Scaling %s processes: %s", appName, strings.Join(processTuples, " ")))
if err := updateScalefile(appName, scale); err != nil {
if err := updateScalefile(appName, clearExisting, scale); err != nil {
return err
}
@@ -407,22 +407,27 @@ func scaleSet(appName string, skipDeploy bool, processTuples []string) error {
return common.PlugnTrigger("release-and-deploy", []string{appName, imageTag}...)
}
func updateScalefile(appName string, scaleUpdates map[string]int) error {
func updateScalefile(appName string, clearExisting bool, scaleUpdates map[string]int) error {
if !hasScaleFile(appName) {
if err := generateScalefile(appName); err != nil {
return err
}
}
scale, err := readScaleFile(appName)
if err != nil {
return err
scale := make(map[string]int)
if !clearExisting {
var err error
scale, err = readScaleFile(appName)
if err != nil {
return err
}
}
procfilePath := getProcfilePath(appName)
procfileExists := hasProcfile(appName)
validProcessTypes := make(map[string]bool)
if procfileExists {
var err error
validProcessTypes, err = processesInProcfile(procfilePath)
if err != nil {
return err

4
plugins/ps/subcommands.go
View File

@@ -123,7 +123,7 @@ func CommandScale(appName string, skipDeploy bool, processTuples []string) error
procfilePath := getProcfilePath(appName)
if !hasScaleFile(appName) || common.FileExists(procfilePath) {
update := func() error {
return updateScalefile(appName, make(map[string]int))
return updateScalefile(appName, false, make(map[string]int))
}
if err := common.SuppressOutput(update); err != nil {
return err
@@ -138,7 +138,7 @@ func CommandScale(appName string, skipDeploy bool, processTuples []string) error
return fmt.Errorf("App %s contains DOKKU_SCALE file and cannot be manually scaled", appName)
}
return scaleSet(appName, skipDeploy, processTuples)
return scaleSet(appName, skipDeploy, false, processTuples)
}
// CommandSet sets or clears a ps property for an app

4
plugins/ps/triggers.go
View File

@@ -150,7 +150,7 @@ func TriggerPostCreate(appName string) error {
return err
}
return updateScalefile(appName, make(map[string]int))
return updateScalefile(appName, false, make(map[string]int))
}
// TriggerPostDelete destroys the ps properties for a given app container
@@ -285,5 +285,5 @@ func TriggerPsCurrentScale(appName string) error {
// TriggerPsSetScale configures the scale parameters for a given app
func TriggerPsSetScale(appName string, skipDeploy bool, processTuples []string) error {
return scaleSet(appName, skipDeploy, processTuples)
return scaleSet(appName, skipDeploy, true, processTuples)
}