Skip to content

Commit

Permalink
Merge pull request moby#21696 from LK4D4/cleanup_unused_daemon
Browse files Browse the repository at this point in the history
daemon: remove some unused code
  • Loading branch information
calavera committed Mar 31, 2016
2 parents f19f91d + b9966f3 commit 6b4f7e6
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
14 changes: 0 additions & 14 deletions container/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,6 @@ const (
loggerCloseTimeout = 10 * time.Second
)

// supervisor defines the interface that a supervisor must implement
type supervisor interface {
// LogContainerEvent generates events related to a given container
LogContainerEvent(*Container, string)
// Cleanup ensures that the container is properly unmounted
Cleanup(*Container)
// StartLogging starts the logging driver for the container
StartLogging(*Container) error
// Run starts a container
Run(c *Container) error
// IsShuttingDown tells whether the supervisor is shutting down or not
IsShuttingDown() bool
}

// Reset puts a container into a state where it can be restarted again.
func (container *Container) Reset(lock bool) {
if lock {
Expand Down
6 changes: 0 additions & 6 deletions daemon/logger/awslogs/cwlogsiface_mock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,3 @@ func (m *mockmetadataclient) Region() (string, error) {
output := <-m.regionResult
return output.successResult, output.errorResult
}

func test() {
_ = &logStream{
client: newMockClient(),
}
}
4 changes: 0 additions & 4 deletions docker/daemon_none.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@ import "github.com/docker/docker/cli"
const daemonUsage = ""

var daemonCli cli.Handler

// notifySystem sends a message to the host when the server is ready to be used
func notifySystem() {
}

0 comments on commit 6b4f7e6

Please sign in to comment.