kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Update Version to not use string anymore 

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
This commit is contained in:
Guillaume J. Charmes 2014-04-01 15:46:52 -07:00
parent b4b87413d8
commit 3ee37f547f
No known key found for this signature in database
GPG Key ID: B33E4642CB6E3FF3
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/common.go
View File

@ -3,15 +3,16 @@ package api
import (
"fmt"
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/pkg/version"
"github.com/dotcloud/docker/utils"
"mime"
"strings"
)
const (
APIVERSION = "1.10"
DEFAULTHTTPHOST = "127.0.0.1"
DEFAULTUNIXSOCKET = "/var/run/docker.sock"
APIVERSION version.Version = "1.10"
DEFAULTHTTPHOST = "127.0.0.1"
DEFAULTUNIXSOCKET = "/var/run/docker.sock"
)
func ValidateHost(val string) (string, error) {

2
api/server/server.go
View File

@ -940,7 +940,7 @@ func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, local
if strings.Contains(r.Header.Get("User-Agent"), "Docker-Client/") {
userAgent := strings.Split(r.Header.Get("User-Agent"), "/")
if len(userAgent) == 2 && !dockerVersion.Equal(userAgent[1]) {
if len(userAgent) == 2 && !dockerVersion.Equal(version.Version(userAgent[1])) {
utils.Debugf("Warning: client and server don't have the same version (client: %s, server: %s)", userAgent[1], dockerVersion)
}
}

14
pkg/version/version.go
View File

@ -7,10 +7,10 @@ import (
type Version string
func (me Version) compareTo(other string) int {
func (me Version) compareTo(other Version) int {
var (
meTab = strings.Split(string(me), ".")
otherTab = strings.Split(other, ".")
otherTab = strings.Split(string(other), ".")
)
for i, s := range meTab {
var meInt, otherInt int
@ -31,22 +31,22 @@ func (me Version) compareTo(other string) int {
return 0
}
func (me Version) LessThan(other string) bool {
func (me Version) LessThan(other Version) bool {
return me.compareTo(other) == -1
}
func (me Version) LessThanOrEqualTo(other string) bool {
func (me Version) LessThanOrEqualTo(other Version) bool {
return me.compareTo(other) <= 0
}
func (me Version) GreaterThan(other string) bool {
func (me Version) GreaterThan(other Version) bool {
return me.compareTo(other) == 1
}
func (me Version) GreaterThanOrEqualTo(other string) bool {
func (me Version) GreaterThanOrEqualTo(other Version) bool {
return me.compareTo(other) >= 0
}
func (me Version) Equal(other string) bool {
func (me Version) Equal(other Version) bool {
return me.compareTo(other) == 0
}

2
pkg/version/version_test.go
View File

@ -5,7 +5,7 @@ import (
)
func assertVersion(t *testing.T, a, b string, result int) {
if r := Version(a).compareTo(b); r != result {
if r := Version(a).compareTo(Version(b)); r != result {
t.Fatalf("Unexpected version comparison result. Found %d, expected %d", r, result)
}
}