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

Merge pull request #8640 from dokku/8631-caddy-haproxy-traefik-report-global-lacks-raw-key-for-global-properties

Browse Source 
Split report global keys into raw and computed
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-23 22:54:23 -04:00
committed by GitHub
parent e795ec97b9 8742f688e3
commit 5df399273a
93 changed files with 2868 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/ps/report.go
View File

@@ -102,12 +102,15 @@ func reportComputedProcfilePath(appName string) string {
if value == "" {
value = reportGlobalProcfilePath(appName)
}
if value == "" {
value = "Procfile"
}
return value
}
func reportGlobalProcfilePath(appName string) string {
return common.PropertyGetDefault("ps", "--global", "procfile-path", "Procfile")
return common.PropertyGet("ps", "--global", "procfile-path")
}
func reportProcfilePath(appName string) string {
@@ -154,14 +157,17 @@ func reportComputedStopTimeoutSeconds(appName string) string {
if value == "" {
value = reportGlobalStopTimeoutSeconds(appName)
}
if value == "" {
value = "30"
}
return value
}
func reportGlobalStopTimeoutSeconds(appName string) string {
return common.PropertyGetDefault("ps", "--global", "stop-timeout-seconds", "30")
return common.PropertyGet("ps", "--global", "stop-timeout-seconds")
}
func reportStopTimeoutSeconds(appName string) string {
return common.PropertyGetDefault("ps", appName, "stop-timeout-seconds", "30")
return common.PropertyGet("ps", appName, "stop-timeout-seconds")
}