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

chore: standardize variable naming

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2019-04-08 16:36:30 -04:00
parent b24697443a
commit a4c30c2ba9
10 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/network/network.go
View File

@@ -52,7 +52,7 @@ func BuildConfig(appName string) {
if len(procParts) != 2 {
continue
}
procType := procParts[0]
processType := procParts[0]
procCount, err := strconv.Atoi(procParts[1])
if err != nil {
continue
@@ -62,25 +62,25 @@ func BuildConfig(appName string) {
for containerIndex < procCount {
containerIndex++
containerIndexString := strconv.Itoa(containerIndex)
containerIDFile := fmt.Sprintf("%v/CONTAINER.%v.%v", appRoot, procType, containerIndex)
containerIDFile := fmt.Sprintf("%v/CONTAINER.%v.%v", appRoot, processType, containerIndex)
containerID := common.ReadFirstLine(containerIDFile)
if containerID == "" || !common.ContainerIsRunning(containerID) {
continue
}
ipAddress := GetContainerIpaddress(appName, procType, containerID)
port := GetContainerPort(appName, procType, isHerokuishContainer, containerID)
ipAddress := GetContainerIpaddress(appName, processType, containerID)
port := GetContainerPort(appName, processType, isHerokuishContainer, containerID)
if ipAddress != "" {
_, err := sh.Command("plugn", "trigger", "network-write-ipaddr", appName, procType, containerIndexString, ipAddress).Output()
_, err := sh.Command("plugn", "trigger", "network-write-ipaddr", appName, processType, containerIndexString, ipAddress).Output()
if err != nil {
common.LogWarn(err.Error())
}
}
if port != "" {
_, err := sh.Command("plugn", "trigger", "network-write-port", appName, procType, containerIndexString, port).Output()
_, err := sh.Command("plugn", "trigger", "network-write-port", appName, processType, containerIndexString, port).Output()
if err != nil {
common.LogWarn(err.Error())
}
@@ -90,8 +90,8 @@ func BuildConfig(appName string) {
}
// GetContainerIpaddress returns the ipaddr for a given app container
func GetContainerIpaddress(appName, procType, containerID string) (ipAddr string) {
if procType != "web" {
func GetContainerIpaddress(appName, processType, containerID string) (ipAddr string) {
if processType != "web" {
return
}
@@ -109,8 +109,8 @@ func GetContainerIpaddress(appName, procType, containerID string) (ipAddr string
}
// GetContainerPort returns the port for a given app container
func GetContainerPort(appName, procType string, isHerokuishContainer bool, containerID string) (port string) {
if procType != "web" {
func GetContainerPort(appName, processType string, isHerokuishContainer bool, containerID string) (port string) {
if processType != "web" {
return
}

4
plugins/network/src/triggers/network-compute-ports/network-compute-ports.go
View File

@@ -15,10 +15,10 @@ import (
func main() {
flag.Parse()
appName := flag.Arg(0)
procType := flag.Arg(1)
processType := flag.Arg(1)
isHerokuishContainer := common.ToBool(flag.Arg(2))
if procType != "web" {
if processType != "web" {
return
}

4
plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go
View File

@@ -12,9 +12,9 @@ import (
func main() {
flag.Parse()
appName := flag.Arg(0)
procType := flag.Arg(1)
processType := flag.Arg(1)
containerID := flag.Arg(2)
ipAddress := network.GetContainerIpaddress(appName, procType, containerID)
ipAddress := network.GetContainerIpaddress(appName, processType, containerID)
fmt.Fprintln(os.Stdout, ipAddress)
}

4
plugins/network/src/triggers/network-get-port/network-get-port.go
View File

@@ -13,10 +13,10 @@ import (
func main() {
flag.Parse()
appName := flag.Arg(0)
procType := flag.Arg(1)
processType := flag.Arg(1)
isHerokuishContainer := common.ToBool(flag.Arg(2))
containerID := flag.Arg(3)
port := network.GetContainerPort(appName, procType, isHerokuishContainer, containerID)
port := network.GetContainerPort(appName, processType, isHerokuishContainer, containerID)
fmt.Fprintln(os.Stdout, port)
}

4
plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go
View File

@@ -13,7 +13,7 @@ import (
func main() {
flag.Parse()
appName := flag.Arg(0)
procType := flag.Arg(1)
processType := flag.Arg(1)
containerIndex := flag.Arg(2)
ip := flag.Arg(3)
@@ -26,7 +26,7 @@ func main() {
}
appRoot := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName}, "/")
filename := fmt.Sprintf("%v/IP.%v.%v", appRoot, procType, containerIndex)
filename := fmt.Sprintf("%v/IP.%v.%v", appRoot, processType, containerIndex)
f, err := os.Create(filename)
if err != nil {
common.LogFail(err.Error())

4
plugins/network/src/triggers/network-write-port/network-write-port.go
View File

@@ -13,7 +13,7 @@ import (
func main() {
flag.Parse()
appName := flag.Arg(0)
procType := flag.Arg(1)
processType := flag.Arg(1)
containerIndex := flag.Arg(2)
port := flag.Arg(3)
@@ -26,7 +26,7 @@ func main() {
}
appRoot := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName}, "/")
filename := fmt.Sprintf("%v/PORT.%v.%v", appRoot, procType, containerIndex)
filename := fmt.Sprintf("%v/PORT.%v.%v", appRoot, processType, containerIndex)
f, err := os.Create(filename)
if err != nil {
common.LogFail(err.Error())