Merge pull request #238 from mota/syntax-cleanup

Syntax cleanup

api/api.go

@@ -273,7 +273,7 @@ func httpError(w http.ResponseWriter, err string, status int) {
 	http.Error(w, err, status)
 }
 
-func createRouter(c *context, enableCors bool) (*mux.Router, error) {
+func createRouter(c *context, enableCors bool) *mux.Router {
 	r := mux.NewRouter()
 	m := map[string]map[string]handler{
 		"GET": {
@@ -352,5 +352,5 @@ func createRouter(c *context, enableCors bool) (*mux.Router, error) {
 		}
 	}
 
-	return r, nil
+	return r
 }

api/api_test.go

@@ -18,10 +18,7 @@ func serveRequest(c *cluster.Cluster, s *scheduler.Scheduler, w http.ResponseWri
 		version:   "test-version",
 	}
 
-	r, err := createRouter(context, false)
+	r := createRouter(context, false)
-	if err != nil {
-		return err
-	}
 	r.ServeHTTP(w, req)
 	return nil
 }

api/server.go

@@ -38,10 +38,7 @@ func ListenAndServe(c *cluster.Cluster, s *scheduler.Scheduler, hosts []string,
 		tlsConfig:     tlsConfig,
 	}
 	c.Events(context.eventsHandler)
-	r, err := createRouter(context, enableCors)
+	r := createRouter(context, enableCors)
-	if err != nil {
-		return err
-	}
 	chErrors := make(chan error, len(hosts))
 
 	for _, host := range hosts {

cluster/node.go

@@ -183,9 +183,10 @@ func (n *Node) ForceRefreshContainer(c dockerclient.Container) error {
 
 func (n *Node) inspectContainer(c dockerclient.Container, containers map[string]*Container, lock bool) error {
 
-	container := &Container{}
+	container := &Container{
-	container.Container = c
+		Container: c,
-	container.Node = n
+		Node:      n,
+	}
 
 	info, err := n.client.InspectContainer(c.Id)
 	if err != nil {
@@ -376,9 +377,9 @@ func (n *Node) handler(ev *dockerclient.Event, args ...interface{}) {
 	}
 
 	event := &Event{
-		Node: n,
+		Node:  n,
+		Event: *ev,
 	}
-	event.Event = *ev
 
 	n.eventHandler.Handle(event)
 }