1. docker
  2. Commit 523803d633e3bf7e4076ad41e73daba491da5d40
Browse code

Handling iptables() errors more usefully during portmapper setup

Shawn Siefkas authored on 2013/03/29 04:44:54
Showing 1 changed files
network.go
History View file @ 523803d
... ... 
@@ -124,13 +124,13 @@ func (mapper *PortMapper) cleanup() error {
124 124
125 125 
 func (mapper *PortMapper) setup() error {
126 126 
 	if err := iptables("-t", "nat", "-N", "DOCKER"); err != nil {
127 
-		return errors.New("Unable to setup port networking: Failed to create DOCKER chain")
127 
+		return fmt.Errorf("Failed to create DOCKER chain: %s", err)
128 128 
 	}
129 129 
 	if err := iptables("-t", "nat", "-A", "PREROUTING", "-j", "DOCKER"); err != nil {
130 
-		return errors.New("Unable to setup port networking: Failed to inject docker in PREROUTING chain")
130 
+		return fmt.Errorf("Failed to inject docker in PREROUTING chain: %s", err)
131 131 
 	}
132 132 
 	if err := iptables("-t", "nat", "-A", "OUTPUT", "-j", "DOCKER"); err != nil {
133 
-		return errors.New("Unable to setup port networking: Failed to inject docker in OUTPUT chain")
133 
+		return fmt.Errorf("Failed to inject docker in OUTPUT chain: %s", err)
134 134 
 	}
135 135 
 	return nil
136 136 
 }