瀏覽代碼

Merge pull request #20825 from LK4D4/unused

Remove some unused structs and fields
Arnaud Porterie 9 年之前
父節點
當前提交
106793dcbe
共有 3 個文件被更改,包括 0 次插入7 次删除
  1. 0 1
      api/client/events.go
  2. 0 5
      daemon/execdriver/native/driver.go
  3. 0 1
      daemon/logger/jsonfilelog/jsonfilelog.go

+ 0 - 1
api/client/events.go

@@ -121,7 +121,6 @@ func printOutput(event eventtypes.Message, output io.Writer) {
 type eventHandler struct {
 type eventHandler struct {
 	handlers map[string]func(eventtypes.Message)
 	handlers map[string]func(eventtypes.Message)
 	mu       sync.Mutex
 	mu       sync.Mutex
-	closed   bool
 }
 }
 
 
 func (w *eventHandler) Handle(action string, h func(eventtypes.Message)) {
 func (w *eventHandler) Handle(action string, h func(eventtypes.Message)) {

+ 0 - 5
daemon/execdriver/native/driver.go

@@ -123,11 +123,6 @@ func NewDriver(root string, options []string) (*Driver, error) {
 	}, nil
 	}, nil
 }
 }
 
 
-type execOutput struct {
-	exitCode int
-	err      error
-}
-
 // Run implements the exec driver Driver interface,
 // Run implements the exec driver Driver interface,
 // it calls libcontainer APIs to run a container.
 // it calls libcontainer APIs to run a container.
 func (d *Driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, hooks execdriver.Hooks) (execdriver.ExitStatus, error) {
 func (d *Driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, hooks execdriver.Hooks) (execdriver.ExitStatus, error) {

+ 0 - 1
daemon/logger/jsonfilelog/jsonfilelog.go

@@ -25,7 +25,6 @@ type JSONFileLogger struct {
 	buf     *bytes.Buffer
 	buf     *bytes.Buffer
 	writer  *loggerutils.RotateFileWriter
 	writer  *loggerutils.RotateFileWriter
 	mu      sync.Mutex
 	mu      sync.Mutex
-	ctx     logger.Context
 	readers map[*logger.LogWatcher]struct{} // stores the active log followers
 	readers map[*logger.LogWatcher]struct{} // stores the active log followers
 	extra   []byte                          // json-encoded extra attributes
 	extra   []byte                          // json-encoded extra attributes
 }
 }