gary/dospin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make image removal contingent upon image existence, remove iptables output logging

Browse Source
This commit is contained in:
Gary Talent 2017-01-21 16:07:46 -06:00
parent 08864049a9
commit aed7c7c565
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
droplethandler.go
View File

@ -154,11 +154,13 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
// delete the image // delete the image
log.Println("Spinup: Deleting image " + name) log.Println("Spinup: Deleting image " + name)
_, err = me.client.Images.Delete(image.ID) if image.ID > -1 {
if err != nil { _, err = me.client.Images.Delete(image.ID)
log.Println("Spinup: Could not delete image: ", err) if err != nil {
} else { log.Println("Spinup: Could not delete image: ", err)
log.Println("Spinup: Deleted image " + name) } else {
log.Println("Spinup: Deleted image " + name)
}
} }
// get the private IP and return it // get the private IP and return it

2
net_linux.go
View File

@ -19,14 +19,12 @@ func addPortForward(ruleName, gatewayInt, localIp, targetIp, port string) {
if err != nil { if err != nil {
log.Println("iptables error:", err) log.Println("iptables error:", err)
} }
log.Println(cmdOut)
cmdOut, err = exec.Command("iptables", "-A", "FORWARD", "-p", "tcp", "-d", targetIp, "--dport", port, "-j", "ACCEPT").Output() cmdOut, err = exec.Command("iptables", "-A", "FORWARD", "-p", "tcp", "-d", targetIp, "--dport", port, "-j", "ACCEPT").Output()
log.Println("iptables", "-A", "FORWARD", "-p", "tcp", "-d", targetIp, "--dport", port, "-j", "ACCEPT") log.Println("iptables", "-A", "FORWARD", "-p", "tcp", "-d", targetIp, "--dport", port, "-j", "ACCEPT")
if err != nil { if err != nil {
log.Println("iptables error:", err) log.Println("iptables error:", err)
} }
log.Println(cmdOut)
} }
func rmPortForward(ruleName string) { func rmPortForward(ruleName string) {