mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Cleanup duplication in daemon files
Signed-off-by: Bily Zhang <xcoder@tenxcloud.com>
This commit is contained in:
parent
c77cfbfef5
commit
345d1fd089
4 changed files with 4 additions and 4 deletions
|
@ -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") {
|
||||
|
|
|
@ -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") {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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{}
|
||||
|
|
Loading…
Add table
Reference in a new issue