Automatic merge from release/2.2.0 -> release/2.3.0

* commit 'c22c05fe03b5e76b4beb62920240a055f784017e':
  修复日志显示错误
This commit is contained in:
邱剑
2018-11-03 17:31:15 +08:00
@@ -458,7 +458,7 @@ func syncVMDisks(ctx context.Context, provider *models.SCloudprovider, task *Clo
}
result := localVM.SyncVMDisks(ctx, task.UserCred, host, disks, provider.ProjectId, syncRange.ProjectSync)
msg := result.Result()
notes := fmt.Sprintf("syncVMNics for VM %s result: %s", localVM.Name, msg)
notes := fmt.Sprintf("syncVMDisks for VM %s result: %s", localVM.Name, msg)
log.Infof(notes)
if result.IsError() {
logSyncFailed(provider, task, msg)