Merge pull request #609 from xiaods/devel

tuning MixedCapped constants
Dataman-Cloud · Nov 8, 2016 · 8359ede · 8359ede
2 parents a32a7ee + 7995c66
commit 8359ede
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 40 deletions.
diff --git a/src/api/container.go b/src/api/container.go
@@ -214,7 +214,7 @@ func (api *Api) LogsContainer(ctx *gin.Context) {
 	for {
 		select {
 		case data := <-message:
-			ctx.SSEvent(dockerclient.SseTypeContainerLogs, data)
+			ctx.SSEvent(dockerclient.SSETypeContainerLogs, data)
 			w.Flush()
 		case <-clientGone:
 			return
@@ -258,7 +258,7 @@ func (api *Api) StatsContainer(ctx *gin.Context) {
 			chnDone <- true
 		case data := <-chnMsg:
 			if !clientClosed {
-				ctx.SSEvent(dockerclient.SseTypeContainerStats, data)
+				ctx.SSEvent(dockerclient.SSETypeContainerStats, data)
 				w.Flush()
 			}
 		case err := <-chnErr:

diff --git a/src/api/service.go b/src/api/service.go
@@ -262,7 +262,7 @@ func (api *Api) LogsService(ctx *gin.Context) {
 	for {
 		select {
 		case data := <-message:
-			ctx.SSEvent(dockerclient.SseTypeServiceLogs, data)
+			ctx.SSEvent(dockerclient.SSETypeServiceLogs, data)
 			w.Flush()
 		case <-clientGone:
 			return
@@ -319,7 +319,7 @@ func (api *Api) StatsService(ctx *gin.Context) {
 			}
 		case data := <-chnMsg:
 			if !clientClosed {
-				ctx.SSEvent(dockerclient.SseTypeServiceStats, data)
+				ctx.SSEvent(dockerclient.SSETypeServiceStats, data)
 				w.Flush()
 			}
 		case err := <-chnErr:

diff --git a/src/dockerclient/common.go b/src/dockerclient/common.go
@@ -92,5 +92,5 @@ func GetServicesNamespace(spec swarm.ServiceSpec) string {
 		return ""
 	}
 
-	return spec.Annotations.Labels[labelNamespace]
+	return spec.Annotations.Labels[LabelNamespace]
 }
diff --git a/src/dockerclient/common_test.go b/src/dockerclient/common_test.go
@@ -106,7 +106,7 @@ func TestGetServicesNamespace(t *testing.T) {
 
 	spec := swarm.ServiceSpec{}
 	spec.Annotations.Labels = map[string]string{
-		labelNamespace: "value",
+		LabelNamespace: "value",
 	}
 	namespace = GetServicesNamespace(spec)
 	assert.Equal(t, namespace, "value")

diff --git a/src/dockerclient/constants.go b/src/dockerclient/constants.go
@@ -4,25 +4,23 @@ import "time"
 
 const (
 	// service running state format string
-	TaskRunningState = "running"
-
-	defaultNetworkDriver = "overlay"
-
-	defaultHttpRequestTimeout = time.Second * 10
+	TaskRunningState          = "running"
+	DefaultNetworkDriver      = "overlay"
+	DefaultHttpRequestTimeout = time.Second * 10
 )
 
 const (
-	labelNamespace    = "com.docker.stack.namespace"
+	LabelNamespace    = "com.docker.stack.namespace"
 	LabelRegistryAuth = "crane.reserved.registry.auth"
-	labelNodeEndpoint = "crane.reserved.node.endpoint"
+	LabelNodeEndpoint = "crane.reserved.node.endpoint"
 )
 
 // sse event type
 const (
-	SseTypeContainerLogs  = "container-logs"
-	SseTypeContainerStats = "container-stats"
-	SseTypeServiceLogs    = "service-logs"
-	SseTypeServiceStats   = "service-stats"
+	SSETypeContainerLogs  = "container-logs"
+	SSETypeContainerStats = "container-stats"
+	SSETypeServiceLogs    = "service-logs"
+	SSETypeServiceStats   = "service-stats"
 )
 
 const (

diff --git a/src/dockerclient/crane_docker_client.go b/src/dockerclient/crane_docker_client.go
@@ -157,13 +157,13 @@ func NewGoDockerClientTls(endpoint string, config *config.Config) (*docker.Clien
 }
 
 func NewHttpClient() (*httpclient.Client, error) {
-	httpClient := &http.Client{Timeout: defaultHttpRequestTimeout}
+	httpClient := &http.Client{Timeout: DefaultHttpRequestTimeout}
 	return httpclient.NewClient(httpClient, nil)
 }
 
 func NewHttpClientTls(config *config.Config) (*httpclient.Client, error) {
 	tlsCaCert, tlsCert, tlsKey := SharedClientCertFiles(config)
-	httpClient := &http.Client{Timeout: defaultHttpRequestTimeout}
+	httpClient := &http.Client{Timeout: DefaultHttpRequestTimeout}
 	return httpclient.NewTLSClient(tlsCaCert, tlsCert, tlsKey, httpClient, nil)
 }
 

diff --git a/src/dockerclient/crane_docker_client_test.go b/src/dockerclient/crane_docker_client_test.go
@@ -29,7 +29,7 @@ func TestNewHttpClient(t *testing.T) {
 	client, err := NewHttpClient()
 	assert.Nil(t, err)
 
-	assert.Equal(t, client.HttpClient.Timeout, defaultHttpRequestTimeout)
+	assert.Equal(t, client.HttpClient.Timeout, DefaultHttpRequestTimeout)
 }
 
 func TestNewHttpClientError(t *testing.T) {

diff --git a/src/dockerclient/network_test.go b/src/dockerclient/network_test.go
@@ -54,13 +54,13 @@ func TestNetwork(t *testing.T) {
 		network1 := docker.Network{
 			ID:     "test1",
 			Name:   "network1",
-			Labels: map[string]string{labelNamespace: "stack1"},
+			Labels: map[string]string{LabelNamespace: "stack1"},
 		}
 		networks = append(networks, network1)
 		network2 := docker.Network{
 			ID:     "test2",
 			Name:   "network2",
-			Labels: map[string]string{labelNamespace: "stack2"},
+			Labels: map[string]string{LabelNamespace: "stack2"},
 		}
 		networks = append(networks, network2)
 		network3 := docker.Network{

diff --git a/src/dockerclient/nodes.go b/src/dockerclient/nodes.go
@@ -116,7 +116,7 @@ func (client *CraneDockerClient) CreateNode(joiningNode model.JoiningNode) error
 	if node.Spec.Annotations.Labels == nil {
 		node.Spec.Annotations.Labels = make(map[string]string)
 	}
-	node.Spec.Annotations.Labels[labelNodeEndpoint] = joiningNode.Endpoint
+	node.Spec.Annotations.Labels[LabelNodeEndpoint] = joiningNode.Endpoint
 	query := url.Values{}
 	query.Set("version", strconv.FormatUint(node.Version.Index, 10))
 	_, err = client.sharedHttpClient.POST(nil, client.swarmManagerHttpEndpoint+"/"+path.Join("nodes", nodeId, "update"), query, node.Spec, nil)
@@ -294,7 +294,7 @@ func (client *CraneDockerClient) nodeUpdateEndpoint(nodeId string, spec *swarm.N
 		spec.Annotations.Labels = make(map[string]string)
 	}
 
-	spec.Annotations.Labels[labelNodeEndpoint] = endpoint
+	spec.Annotations.Labels[LabelNodeEndpoint] = endpoint
 	return nil
 }
 
@@ -315,7 +315,7 @@ func (client *CraneDockerClient) GetDaemonUrlById(nodeId string) (*url.URL, erro
 		return nil, &cranerror.CraneError{Code: CodeGetNodeEndpointError, Err: nodeConnErr}
 	}
 
-	endpoint, ok := node.Spec.Annotations.Labels[labelNodeEndpoint]
+	endpoint, ok := node.Spec.Annotations.Labels[LabelNodeEndpoint]
 	if !ok {
 		nodeConnErr = &cranerror.NodeConnError{ID: nodeId, Endpoint: endpoint, Err: err}
 		return nil, &cranerror.CraneError{Code: CodeGetNodeEndpointError, Err: nodeConnErr}

diff --git a/src/dockerclient/stack.go b/src/dockerclient/stack.go
@@ -119,7 +119,7 @@ func (client *CraneDockerClient) PretreatmentStack(bundle model.Bundle) (map[str
 // list all stack
 func (client *CraneDockerClient) ListStack() (Stacks, error) {
 	filter := filters.NewArgs()
-	filter.Add("label", labelNamespace)
+	filter.Add("label", LabelNamespace)
 	services, err := client.ListServiceSpec(types.ServiceListOptions{Filter: filter})
 	if err != nil {
 		return nil, err
@@ -128,9 +128,9 @@ func (client *CraneDockerClient) ListStack() (Stacks, error) {
 	stackMap := make(map[string]*Stack, 0)
 	for _, service := range services {
 		labels := service.Spec.Labels
-		name, ok := labels[labelNamespace]
+		name, ok := labels[LabelNamespace]
 		if !ok {
-			log.Warnf("Cannot get label %s for service %s", labelNamespace, service.ID)
+			log.Warnf("Cannot get label %s for service %s", LabelNamespace, service.ID)
 			continue
 		}
 
@@ -227,7 +227,7 @@ func (client *CraneDockerClient) FilterServiceByStack(namespace string, opts typ
 	if opts.Filter.Len() == 0 {
 		opts.Filter = filters.NewArgs()
 	}
-	opts.Filter.Add("label", labelNamespace)
+	opts.Filter.Add("label", LabelNamespace)
 	services, err := client.ListServiceSpec(opts)
 	if err != nil {
 		return nil, err
@@ -236,9 +236,9 @@ func (client *CraneDockerClient) FilterServiceByStack(namespace string, opts typ
 	var stackServices []swarm.Service
 	for _, service := range services {
 		labels := service.Spec.Labels
-		name, ok := labels[labelNamespace]
+		name, ok := labels[LabelNamespace]
 		if !ok {
-			log.Warnf("Cannot get label %s for service %s", labelNamespace, service.ID)
+			log.Warnf("Cannot get label %s for service %s", LabelNamespace, service.ID)
 			continue
 		}
 
@@ -279,7 +279,7 @@ func (client *CraneDockerClient) updateNetworks(networks map[string]bool, namesp
 
 	createOpts := &docker.CreateNetworkOptions{
 		Labels: client.getStackLabels(namespace, nil),
-		Driver: defaultNetworkDriver,
+		Driver: DefaultNetworkDriver,
 		// docker TODO: remove when engine-api uses omitempty for IPAM
 		IPAM: docker.IPAMOptions{Driver: "default"},
 	}
@@ -404,14 +404,14 @@ func (client *CraneDockerClient) getStackLabels(namespace string, labels map[str
 		labels = make(map[string]string)
 	}
 
-	labels[labelNamespace] = namespace
+	labels[LabelNamespace] = namespace
 	return labels
 }
 
 // split joint stack filter
 func (client *CraneDockerClient) getStackFilter(namespace string) filters.Args {
 	filter := filters.NewArgs()
-	filter.Add("label", labelNamespace+"="+namespace)
+	filter.Add("label", LabelNamespace+"="+namespace)
 	return filter
 }
 
@@ -422,7 +422,7 @@ func (client *CraneDockerClient) filterStackServices(namespace string) ([]swarm.
 
 // get network by default filter
 func (client *CraneDockerClient) filterStackNetwork(namespace string) ([]docker.Network, error) {
-	filter := docker.NetworkFilterOpts{"label": map[string]bool{labelNamespace: true}}
+	filter := docker.NetworkFilterOpts{"label": map[string]bool{LabelNamespace: true}}
 	networks, err := client.ListNetworks(filter)
 	if err != nil {
 		return nil, err
@@ -434,7 +434,7 @@ func (client *CraneDockerClient) filterStackNetwork(namespace string) ([]docker.
 			continue
 		}
 
-		if name, ok := network.Labels[labelNamespace]; !ok || name != namespace {
+		if name, ok := network.Labels[LabelNamespace]; !ok || name != namespace {
 			continue
 		}
 

diff --git a/src/dockerclient/stack_test.go b/src/dockerclient/stack_test.go
@@ -200,7 +200,7 @@ func TestStack(t *testing.T) {
 				Spec: swarm.ServiceSpec{
 					Annotations: swarm.Annotations{
 						Name:   "service1",
-						Labels: map[string]string{labelNamespace: "stack1"},
+						Labels: map[string]string{LabelNamespace: "stack1"},
 					},
 				},
 			}
@@ -211,7 +211,7 @@ func TestStack(t *testing.T) {
 				Spec: swarm.ServiceSpec{
 					Annotations: swarm.Annotations{
 						Name:   "service1",
-						Labels: map[string]string{labelNamespace: "stack1"},
+						Labels: map[string]string{LabelNamespace: "stack1"},
 					},
 				},
 			}
@@ -232,13 +232,13 @@ func TestStack(t *testing.T) {
 			network1 := docker.Network{
 				ID:     "test1",
 				Name:   "network1",
-				Labels: map[string]string{labelNamespace: "stack1"},
+				Labels: map[string]string{LabelNamespace: "stack1"},
 			}
 			networks = append(networks, network1)
 			network2 := docker.Network{
 				ID:     "test2",
 				Name:   "network2",
-				Labels: map[string]string{labelNamespace: "stack2"},
+				Labels: map[string]string{LabelNamespace: "stack2"},
 			}
 			networks = append(networks, network2)
 			network3 := docker.Network{