diff --git a/container/docker/handler.go b/container/docker/handler.go index ed7dfb9a..9bb41774 100644 --- a/container/docker/handler.go +++ b/container/docker/handler.go @@ -48,16 +48,6 @@ type dockerContainerHandler struct { aliases []string machineInfoFactory info.MachineInfoFactory - // Path to the libcontainer config file. - libcontainerConfigPath string - - // Path to the libcontainer state file. - libcontainerStatePath string - - // TODO(vmarmol): Remove when we depend on a newer Docker. - // Path to the libcontainer pid file. - libcontainerPidPath string - // Absolute path to the cgroup hierarchies of this container. // (e.g.: "cpu" -> "/sys/fs/cgroup/cpu/test") cgroupPaths map[string]string diff --git a/events/handler.go b/events/handler.go index a9146f86..abd22a16 100644 --- a/events/handler.go +++ b/events/handler.go @@ -115,9 +115,6 @@ type watch struct { request *Request // a channel used to send event back to the caller. eventChannel *EventChannel - // unique identifier of a watch that is used as a key in events' watchers - // map - id int } func NewEventChannel(watchId int) *EventChannel { diff --git a/manager/manager.go b/manager/manager.go index 4ec48d05..38bd4e1f 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -21,7 +21,6 @@ import ( "fmt" "os" "path" - "regexp" "strconv" "strings" "sync" @@ -190,7 +189,6 @@ type manager struct { quitChannels []chan error cadvisorContainer string inHostNamespace bool - dockerContainersRegexp *regexp.Regexp loadReader cpuload.CpuLoadReader eventHandler events.EventManager startupTime time.Time