Merge pull request #238 from vmarmol/inotify

Use inotify to watch for new containers.

container/container.go

@@ -24,6 +24,20 @@ const (
 
 type ListType int
 
+// SubcontainerEvent types.
+const (
+	SUBCONTAINER_ADD = iota
+	SUBCONTAINER_DELETE
+)
+
+type SubcontainerEvent struct {
+	// The type of event that occurred.
+	EventType int
+
+	// The full container name of the container where the event occurred.
+	Name string
+}
+
 // Interface for container operation handlers.
 type ContainerHandler interface {
 	ContainerReference() (info.ContainerReference, error)
@@ -32,4 +46,5 @@ type ContainerHandler interface {
 	ListContainers(listType ListType) ([]info.ContainerReference, error)
 	ListThreads(listType ListType) ([]int, error)
 	ListProcesses(listType ListType) ([]int, error)
+	WatchSubcontainers(events chan SubcontainerEvent) error
 }

container/docker/handler.go

@@ -262,3 +262,7 @@ func (self *dockerContainerHandler) ListProcesses(listType container.ListType) (
 	}
 	return fs.GetPids(c)
 }
+
+func (self *dockerContainerHandler) WatchSubcontainers(events chan container.SubcontainerEvent) error {
+	return fmt.Errorf("watch is unimplemented in the Docker container driver")
+}

container/mock.go

@@ -69,6 +69,11 @@ func (self *MockContainerHandler) ListProcesses(listType ListType) ([]int, error
 	return args.Get(0).([]int), args.Error(1)
 }
 
+func (self *MockContainerHandler) WatchSubcontainers(events chan SubcontainerEvent) error {
+	args := self.Called(events)
+	return args.Error(0)
+}
+
 type FactoryForMockContainerHandler struct {
 	Name                        string
 	PrepareContainerHandlerFunc func(name string, handler *MockContainerHandler)