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

feat: optionally log

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-02-25 20:11:43 -05:00
parent 6ecf6c31ba
commit e6bf778a65
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/proxy/proxy.go
View File

@@ -100,7 +100,8 @@ func getAppProxyType(appName string) string {
func getProxyPortMap(appName string) []PortMap {
value := config.GetWithDefault(appName, "DOKKU_PROXY_PORT_MAP", "")
return parseProxyPortMapString(value)
warn := false
return parseProxyPortMapString(value, warn)
}
func listAppProxyPorts(appName string) error {
@@ -165,24 +166,30 @@ func removeProxyPorts(appName string, proxyPortMap []PortMap) error {
return setProxyPorts(appName, toSet)
}
func parseProxyPortMapString(stringPortMap string) []PortMap {
func parseProxyPortMapString(stringPortMap string, warn bool) []PortMap {
var proxyPortMap []PortMap
for _, v := range strings.Split(strings.TrimSpace(stringPortMap), " ") {
parts := strings.SplitN(v, ":", 3)
if len(parts) != 3 {
common.LogWarn(fmt.Sprintf("Invalid port map %s", v))
if warn {
common.LogWarn(fmt.Sprintf("Invalid port map %s", v))
}
continue
}
hostPort, err := strconv.Atoi(parts[1])
if err != nil {
common.LogWarn(fmt.Sprintf("Invalid port map %s", v))
if warn {
common.LogWarn(fmt.Sprintf("Invalid port map %s", v))
}
}
containerPort, err := strconv.Atoi(parts[2])
if err != nil {
common.LogWarn(fmt.Sprintf("Invalid port map %s", v))
if warn {
common.LogWarn(fmt.Sprintf("Invalid port map %s", v))
}
}
proxyPortMap = append(proxyPortMap, PortMap{

9
plugins/proxy/subcommands.go
View File

@@ -85,7 +85,8 @@ func CommandPortsAdd(args []string) error {
}
stringPortMap := strings.Join(args[1:], " ")
proxyPortMap := parseProxyPortMapString(stringPortMap)
warn := true
proxyPortMap := parseProxyPortMapString(stringPortMap, warn)
if err := addProxyPorts(appName, proxyPortMap); err != nil {
return err
}
@@ -121,7 +122,8 @@ func CommandPortsRemove(args []string) error {
}
stringPortMap := strings.Join(args[1:], " ")
proxyPortMap := parseProxyPortMapString(stringPortMap)
warn := true
proxyPortMap := parseProxyPortMapString(stringPortMap, warn)
if err := removeProxyPorts(appName, proxyPortMap); err != nil {
return err
}
@@ -141,7 +143,8 @@ func CommandPortsSet(args []string) error {
}
stringPortMap := strings.Join(args[1:], " ")
proxyPortMap := parseProxyPortMapString(stringPortMap)
warn := true
proxyPortMap := parseProxyPortMapString(stringPortMap, warn)
if err := setProxyPorts(appName, proxyPortMap); err != nil {
return err
}