From 4c2b9d732446adb472667c2a7017ba3e8cc58c0d Mon Sep 17 00:00:00 2001
From: unclejack <unclejacksons@gmail.com>
Date: Fri, 9 May 2014 10:09:33 +0300
Subject: [PATCH] rename goruntime import to runtime
This renames the goruntime import of the runtime package back to
runtime.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
---
api/client/commands.go | 4 ++--
integration/runtime_test.go | 4 ++--
server/server.go | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/api/client/commands.go b/api/client/commands.go
index 89f9b0a4c4..46fec3f28a 100644
--- a/api/client/commands.go
+++ b/api/client/commands.go
@@ -13,7 +13,7 @@ import (
"os"
"os/exec"
"path"
- goruntime "runtime"
+ "runtime"
"strconv"
"strings"
"syscall"
@@ -359,7 +359,7 @@ func (cli *DockerCli) CmdVersion(args ...string) error {
fmt.Fprintf(cli.out, "Client version: %s\n", dockerversion.VERSION)
}
fmt.Fprintf(cli.out, "Client API version: %s\n", api.APIVERSION)
- fmt.Fprintf(cli.out, "Go version (client): %s\n", goruntime.Version())
+ fmt.Fprintf(cli.out, "Go version (client): %s\n", runtime.Version())
if dockerversion.GITCOMMIT != "" {
fmt.Fprintf(cli.out, "Git commit (client): %s\n", dockerversion.GITCOMMIT)
}
diff --git a/integration/runtime_test.go b/integration/runtime_test.go
index c84ea5bed2..07207c9b53 100644
--- a/integration/runtime_test.go
+++ b/integration/runtime_test.go
@@ -16,7 +16,7 @@ import (
"net/url"
"os"
"path/filepath"
- goruntime "runtime"
+ "runtime"
"strconv"
"strings"
"syscall"
@@ -127,7 +127,7 @@ func init() {
spawnGlobalDaemon()
spawnLegitHttpsDaemon()
spawnRogueHttpsDaemon()
- startFds, startGoroutines = utils.GetTotalUsedFds(), goruntime.NumGoroutine()
+ startFds, startGoroutines = utils.GetTotalUsedFds(), runtime.NumGoroutine()
}
func setupBaseImage() {
diff --git a/server/server.go b/server/server.go
index 3763f87dd5..30e5ef1f6f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -34,7 +34,7 @@ import (
gosignal "os/signal"
"path"
"path/filepath"
- goruntime "runtime"
+ "runtime"
"strconv"
"strings"
"sync"
@@ -789,7 +789,7 @@ func (srv *Server) DockerInfo(job *engine.Job) engine.Status {
v.SetBool("IPv4Forwarding", !srv.daemon.SystemConfig().IPv4ForwardingDisabled)
v.SetBool("Debug", os.Getenv("DEBUG") != "")
v.SetInt("NFd", utils.GetTotalUsedFds())
- v.SetInt("NGoroutines", goruntime.NumGoroutine())
+ v.SetInt("NGoroutines", runtime.NumGoroutine())
v.Set("ExecutionDriver", srv.daemon.ExecutionDriver().Name())
v.SetInt("NEventsListener", len(srv.listeners))
v.Set("KernelVersion", kernelVersion)
@@ -807,9 +807,9 @@ func (srv *Server) DockerVersion(job *engine.Job) engine.Status {
v.Set("Version", dockerversion.VERSION)
v.SetJson("ApiVersion", api.APIVERSION)
v.Set("GitCommit", dockerversion.GITCOMMIT)
- v.Set("GoVersion", goruntime.Version())
- v.Set("Os", goruntime.GOOS)
- v.Set("Arch", goruntime.GOARCH)
+ v.Set("GoVersion", runtime.Version())
+ v.Set("Os", runtime.GOOS)
+ v.Set("Arch", runtime.GOARCH)
if kernelVersion, err := utils.GetKernelVersion(); err == nil {
v.Set("KernelVersion", kernelVersion.String())
}