Browse code

Fix steam where it should be stream.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Jessica Frazelle authored on 2014/11/19 03:49:01
Showing 2 changed files
... ...
@@ -916,13 +916,13 @@ func (cli *DockerCli) CmdPort(args ...string) error {
916 916
 		return nil
917 917
 	}
918 918
 
919
-	steam, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)
919
+	stream, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)
920 920
 	if err != nil {
921 921
 		return err
922 922
 	}
923 923
 
924 924
 	env := engine.Env{}
925
-	if err := env.Decode(steam); err != nil {
925
+	if err := env.Decode(stream); err != nil {
926 926
 		return err
927 927
 	}
928 928
 	ports := nat.PortMap{}
... ...
@@ -1856,13 +1856,13 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
1856 1856
 	}
1857 1857
 	name := cmd.Arg(0)
1858 1858
 
1859
-	steam, _, err := cli.call("GET", "/containers/"+name+"/json", nil, false)
1859
+	stream, _, err := cli.call("GET", "/containers/"+name+"/json", nil, false)
1860 1860
 	if err != nil {
1861 1861
 		return err
1862 1862
 	}
1863 1863
 
1864 1864
 	env := engine.Env{}
1865
-	if err := env.Decode(steam); err != nil {
1865
+	if err := env.Decode(stream); err != nil {
1866 1866
 		return err
1867 1867
 	}
1868 1868
 
... ...
@@ -216,7 +216,7 @@ func waitForExit(cli *DockerCli, containerId string) (int, error) {
216 216
 // getExitCode perform an inspect on the container. It returns
217 217
 // the running state and the exit code.
218 218
 func getExitCode(cli *DockerCli, containerId string) (bool, int, error) {
219
-	steam, _, err := cli.call("GET", "/containers/"+containerId+"/json", nil, false)
219
+	stream, _, err := cli.call("GET", "/containers/"+containerId+"/json", nil, false)
220 220
 	if err != nil {
221 221
 		// If we can't connect, then the daemon probably died.
222 222
 		if err != ErrConnectionRefused {
... ...
@@ -226,7 +226,7 @@ func getExitCode(cli *DockerCli, containerId string) (bool, int, error) {
226 226
 	}
227 227
 
228 228
 	var result engine.Env
229
-	if err := result.Decode(steam); err != nil {
229
+	if err := result.Decode(stream); err != nil {
230 230
 		return false, -1, err
231 231
 	}
232 232