Skip to content

Commit

Permalink
Cleanup duplication in daemon files
Browse files Browse the repository at this point in the history
Signed-off-by: Bily Zhang <xcoder@tenxcloud.com>
  • Loading branch information
mooncak committed Nov 13, 2018
1 parent c77cfbf commit 345d1fd
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion daemon/graphdriver/lcow/lcow.go
Expand Up @@ -751,7 +751,7 @@ func (d *Driver) Cleanup() error {

// Note we don't return an error below - it's possible the files
// are locked. However, next time around after the daemon exits,
// we likely will be able to to cleanup successfully. Instead we log
// we likely will be able to cleanup successfully. Instead we log
// warnings if there are errors.
for _, item := range items {
if item.IsDir() && strings.HasSuffix(item.Name(), "-removing") {
Expand Down
2 changes: 1 addition & 1 deletion daemon/graphdriver/windows/windows.go
Expand Up @@ -456,7 +456,7 @@ func (d *Driver) Cleanup() error {

// Note we don't return an error below - it's possible the files
// are locked. However, next time around after the daemon exits,
// we likely will be able to to cleanup successfully. Instead we log
// we likely will be able to cleanup successfully. Instead we log
// warnings if there are errors.
for _, item := range items {
if item.IsDir() && strings.HasSuffix(item.Name(), "-removing") {
Expand Down
2 changes: 1 addition & 1 deletion daemon/logger/awslogs/cloudwatchlogs.go
Expand Up @@ -288,7 +288,7 @@ func newAWSLogsClient(info logger.Info) (api, error) {

sess, err := session.NewSession()
if err != nil {
return nil, errors.New("Failed to create a service client session for for awslogs driver")
return nil, errors.New("Failed to create a service client session for awslogs driver")
}

// attach region to cloudwatchlogs config
Expand Down
2 changes: 1 addition & 1 deletion daemon/logger/logger.go
Expand Up @@ -103,7 +103,7 @@ type LogReader interface {
type LogWatcher struct {
// For sending log messages to a reader.
Msg chan *Message
// For sending error messages that occur while while reading logs.
// For sending error messages that occur while reading logs.
Err chan error
producerOnce sync.Once
producerGone chan struct{}
Expand Down

0 comments on commit 345d1fd

Please sign in to comment.