fixed tcp/udp I/O, deadlock, nil dereference; improved docker watcher, idlewatcher, loading page

src/watcher/docker_watcher.go

@@ -42,11 +42,19 @@ func DockerrFilterContainerName(name string) filters.KeyValuePair {
 }
 
 func NewDockerWatcher(host string) DockerWatcher {
-	return DockerWatcher{host: host, FieldLogger: logrus.WithField("module", "docker_watcher")}
+	return DockerWatcher{
+		host: host,
+		FieldLogger: (logrus.
+			WithField("module", "docker_watcher").
+			WithField("host", host))}
 }
 
 func NewDockerWatcherWithClient(client D.Client) DockerWatcher {
-	return DockerWatcher{client: client, FieldLogger: logrus.WithField("module", "docker_watcher")}
+	return DockerWatcher{
+		client: client,
+		FieldLogger: (logrus.
+			WithField("module", "docker_watcher").
+			WithField("host", client.DaemonHost()))}
 }
 
 func (w DockerWatcher) Events(ctx context.Context) (<-chan Event, <-chan E.NestedError) {
@@ -56,7 +64,6 @@ func (w DockerWatcher) Events(ctx context.Context) (<-chan Event, <-chan E.Neste
 func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerListOptions) (<-chan Event, <-chan E.NestedError) {
 	eventCh := make(chan Event)
 	errCh := make(chan E.NestedError)
-	started := make(chan struct{})
 
 	eventsCtx, eventsCancel := context.WithCancel(ctx)
 
@@ -75,7 +82,7 @@ func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerList
 			attempts := 0
 			for {
 				w.client, err = D.ConnectClient(w.host)
-				if err != nil {
+				if err == nil {
 					break
 				}
 				attempts++
@@ -89,8 +96,11 @@ func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerList
 			}
 		}
 
+		w.Debugf("client connected")
+
 		cEventCh, cErrCh := w.client.Events(eventsCtx, options)
-		started <- struct{}{}
+
+		w.Debugf("watcher started")
 
 		for {
 			select {
@@ -130,7 +140,6 @@ func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerList
 			}
 		}
 	}()
-	<-started
 
 	return eventCh, errCh
 }

src/watcher/events/events.go

@@ -14,36 +14,64 @@ type (
 		ActorAttributes map[string]string
 		Action          Action
 	}
-	Action    string
+	Action    uint16
 	EventType string
 )
 
 const (
-	ActionFileModified Action = "modified"
-	ActionFileCreated  Action = "created"
-	ActionFileDeleted  Action = "deleted"
+	ActionFileModified Action = (1 << iota)
+	ActionFileCreated
+	ActionFileDeleted
 
-	ActionDockerStartUnpause Action = "start"
-	ActionDockerStopPause    Action = "stop"
+	ActionContainerCreate
+	ActionContainerStart
+	ActionContainerUnpause
 
+	ActionContainerKill
+	ActionContainerStop
+	ActionContainerPause
+	ActionContainerDie
+
+	actionContainerWakeMask  = ActionContainerCreate | ActionContainerStart | ActionContainerUnpause
+	actionContainerSleepMask = ActionContainerKill | ActionContainerStop | ActionContainerPause | ActionContainerDie
+)
+
+const (
 	EventTypeDocker EventType = "docker"
 	EventTypeFile   EventType = "file"
 )
 
 var DockerEventMap = map[dockerEvents.Action]Action{
-	dockerEvents.ActionCreate:  ActionDockerStartUnpause,
-	dockerEvents.ActionStart:   ActionDockerStartUnpause,
-	dockerEvents.ActionPause:   ActionDockerStartUnpause,
-	dockerEvents.ActionDie:     ActionDockerStopPause,
-	dockerEvents.ActionStop:    ActionDockerStopPause,
-	dockerEvents.ActionUnPause: ActionDockerStopPause,
-	dockerEvents.ActionKill:    ActionDockerStopPause,
+	dockerEvents.ActionCreate:  ActionContainerCreate,
+	dockerEvents.ActionStart:   ActionContainerStart,
+	dockerEvents.ActionUnPause: ActionContainerUnpause,
+
+	dockerEvents.ActionKill:  ActionContainerKill,
+	dockerEvents.ActionStop:  ActionContainerStop,
+	dockerEvents.ActionPause: ActionContainerPause,
+	dockerEvents.ActionDie:   ActionContainerDie,
 }
 
+var dockerActionNameMap = func() (m map[Action]string) {
+	m = make(map[Action]string, len(DockerEventMap))
+	for k, v := range DockerEventMap {
+		m[v] = string(k)
+	}
+	return
+}()
+
 func (e Event) String() string {
 	return fmt.Sprintf("%s %s", e.ActorName, e.Action)
 }
 
-func (a Action) IsDelete() bool {
-	return a == ActionFileDeleted
+func (a Action) String() string {
+	return dockerActionNameMap[a]
+}
+
+func (a Action) IsContainerWake() bool {
+	return a&actionContainerWakeMask != 0
+}
+
+func (a Action) IsContainerSleep() bool {
+	return a&actionContainerSleepMask != 0
 }