InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated words in daemon files

Browse Source 
Signed-off-by: mooncake <xcoder@tenxcloud.com>
This commit is contained in:
mooncake
2018-10-05 21:37:42 +08:00
parent c77cfbfef5
commit ea60a87fcf
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/graphdriver/lcow/lcow.go
View File

@@ -236,7 +236,7 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped
logrus.Debugf("%s: adding entry to service vm map", title)
svm, exists, err := d.serviceVms.add(id)
if err != nil && err == errVMisTerminating {
// VM is in the process of terminating. Wait until it's done and and then try again
// VM is in the process of terminating. Wait until it's done and then try again
logrus.Debugf("%s: VM with current ID still in the process of terminating", title)
if err := svm.getStopError(); err != nil {
logrus.Debugf("%s: VM did not stop successfully: %s", title, err)
@@ -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") {

2
daemon/graphdriver/windows/windows.go
View File

@@ -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") {

2
daemon/logger/logger.go
View File

@@ -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{}