Bugfix/yousong use xxxln (#235)

* treewide: fix typo cloudprovide

* dep: update yunion.io/x/log

* treewide: log.Errorf(err.Error()) to log.Errorln(err)

Gopkg.lock

@@ -1700,14 +1700,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:636db180d3fc734536a5437d93bb6fe937feb036c1ed062c25872a47c4283163"
+  digest = "1:d4ebc35bc25d8a3d3a264bb80f9b1a07c344283410d7f78f6d9d2dab1858a82f"
   name = "yunion.io/x/log"
   packages = [
     ".",
     "hooks",
   ]
   pruneopts = "UT"
-  revision = "5185c49f6d361f61e561fbccba1bedcc7c62748b"
+  revision = "0b4a12f87d57e3293568174ddbcb91da97d3b5ec"
 
 [[projects]]
   branch = "master"

pkg/compute/guestdrivers/kvm.go

@@ -129,7 +129,7 @@ func (self *SKVMGuestDriver) GetGuestVncInfo(ctx context.Context, userCred mccli
 	ret, err := host.Request(ctx, userCred, "POST", url, nil, body)
 	if err != nil {
 		err = fmt.Errorf("Fail to request VNC info %s", err)
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return nil, err
 	}
 	results, _ := ret.GetString("results")

pkg/compute/models/cloudsync.go

@@ -912,7 +912,7 @@ func SyncCloudProject(userCred mcclient.TokenCredential, model db.IVirtualModel,
 	if extProjectId := extModel.GetProjectId(); len(extProjectId) > 0 {
 		extProject, err := ExternalProjectManager.GetProject(extProjectId, managerId)
 		if err != nil {
-			log.Errorf(err.Error())
+			log.Errorln(err)
 		} else {
 			newId = extProject.ProjectId
 		}

pkg/compute/models/disks.go

@@ -336,7 +336,7 @@ func (self *SDisk) GetGuests() []SGuest {
 	// q.DebugQuery()
 	err := db.FetchModelObjects(GuestManager, q, &result)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return nil
 	}
 	return result
@@ -1670,7 +1670,7 @@ func (manager *SDiskManager) AutoDiskSnapshot(ctx context.Context, userCred mccl
 
 func (disk *SDisk) StratCreateBackupTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
 	if task, err := taskman.TaskManager.NewTask(ctx, "DiskCreateBackupTask", disk, userCred, nil, parentTaskId, "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)

pkg/compute/models/guest_actions.go

@@ -249,7 +249,7 @@ func (self *SGuest) StartMigrateTask(ctx context.Context, userCred mcclient.Toke
 	}
 	data.Set("guest_status", jsonutils.NewString(guestStatus))
 	if task, err := taskman.TaskManager.NewTask(ctx, "GuestMigrateTask", self, userCred, data, parentTaskId, "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -307,7 +307,7 @@ func (self *SGuest) StartGuestLiveMigrateTask(ctx context.Context, userCred mccl
 	}
 	data.Set("guest_status", jsonutils.NewString(guestStatus))
 	if task, err := taskman.TaskManager.NewTask(ctx, "GuestLiveMigrateTask", self, userCred, data, parentTaskId, "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -374,7 +374,7 @@ func (self *SGuest) PerformClone(ctx context.Context, userCred mcclient.TokenCre
 	pendingUsage := getGuestResourceRequirements(ctx, userCred, createInput, 1, false)
 	if task, err := taskman.TaskManager.NewTask(ctx, "GuestCloneTask", model, userCred,
 		dataDict, "", "", &pendingUsage); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return nil, err
 	} else {
 		task.ScheduleRun(nil)
@@ -532,7 +532,7 @@ func (self *SGuest) StartSyncTask(ctx context.Context, userCred mcclient.TokenCr
 	if fwOnly {
 		data.Add(jsonutils.JSONTrue, "fw_only")
 	} else if err := self.SetStatus(userCred, VM_SYNC_CONFIG, ""); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	}
 	return self.doSyncTask(ctx, data, userCred, parentTaskId)
@@ -547,7 +547,7 @@ func (self *SGuest) StartSyncTaskWithoutSyncstatus(ctx context.Context, userCred
 
 func (self *SGuest) doSyncTask(ctx context.Context, data *jsonutils.JSONDict, userCred mcclient.TokenCredential, parentTaskId string) error {
 	if task, err := taskman.TaskManager.NewTask(ctx, "GuestSyncConfTask", self, userCred, data, parentTaskId, "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -2439,7 +2439,7 @@ func (self *SGuest) PerformSwitchToBackup(ctx context.Context, userCred mcclient
 	taskData.Set("delete_backup", jsonutils.NewBool(deleteBackup))
 	taskData.Set("purge_backup", jsonutils.NewBool(purgeBackup))
 	if task, err := taskman.TaskManager.NewTask(ctx, "GuestSwitchToBackupTask", self, userCred, taskData, "", "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return nil, err
 	} else {
 		task.ScheduleRun(nil)
@@ -2507,7 +2507,7 @@ func (self *SGuest) StartGuestDeleteOnHostTask(ctx context.Context, userCred mcc
 	taskData.Set("purge", jsonutils.NewBool(purge))
 	if task, err := taskman.TaskManager.NewTask(
 		ctx, "GuestDeleteOnHostTask", self, userCred, taskData, parentTaskId, "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -2519,7 +2519,7 @@ func (guest *SGuest) GuestStartAndSyncToBackup(ctx context.Context, userCred mcc
 	data *jsonutils.JSONDict, parentTaskId string) error {
 	task, err := taskman.TaskManager.NewTask(ctx, "GuestStartAndSyncToBackupTask", guest, userCred, data, parentTaskId, "", nil)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -2559,7 +2559,7 @@ func (self *SGuest) PerformCreateBackup(ctx context.Context, userCred mcclient.T
 	task, err := taskman.TaskManager.NewTask(ctx, "GuestCreateBackupTask", self, userCred, params, "", "", &req)
 	if err != nil {
 		QuotaManager.CancelPendingUsage(ctx, userCred, self.ProjectId, nil, &req)
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return nil, err
 	} else {
 		task.ScheduleRun(nil)
@@ -2591,7 +2591,7 @@ func (self *SGuest) PerformDeleteBackup(ctx context.Context, userCred mcclient.T
 	self.SetStatus(userCred, VM_DELETING_BACKUP, "delete backup server")
 	if task, err := taskman.TaskManager.NewTask(
 		ctx, "GuestDeleteOnHostTask", self, userCred, taskData, "", "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return nil, err
 	} else {
 		task.ScheduleRun(nil)
@@ -2601,7 +2601,7 @@ func (self *SGuest) PerformDeleteBackup(ctx context.Context, userCred mcclient.T
 
 func (self *SGuest) CreateBackupDisks(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
 	if task, err := taskman.TaskManager.NewTask(ctx, "GuestCreateBackupDisksTask", self, userCred, nil, parentTaskId, "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -2615,7 +2615,7 @@ func (self *SGuest) StartCreateBackup(ctx context.Context, userCred mcclient.Tok
 	}
 	kwargs.Add(jsonutils.NewString("create"), "deploy_action")
 	if task, err := taskman.TaskManager.NewTask(ctx, "GuestDeployBackupTask", self, userCred, kwargs, parentTaskId, "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)

pkg/compute/models/hosts.go

@@ -2031,7 +2031,7 @@ func (manager *SHostManager) TotalCount(
 func (self *SHost) GetIZone() (cloudprovider.ICloudZone, error) {
 	provider, err := self.GetCloudProvider()
 	if err != nil {
-		return nil, fmt.Errorf("No cloudprovide for host: %s", err)
+		return nil, fmt.Errorf("No cloudprovider for host: %s", err)
 	}
 	zone := self.GetZone()
 	if zone == nil {
@@ -2061,7 +2061,7 @@ func (self *SHost) GetIHost() (cloudprovider.ICloudHost, error) {
 func (self *SHost) GetIHostAndProvider() (cloudprovider.ICloudHost, cloudprovider.ICloudProvider, error) {
 	provider, err := self.GetDriver()
 	if err != nil {
-		return nil, nil, fmt.Errorf("No cloudprovide for host: %s", err)
+		return nil, nil, fmt.Errorf("No cloudprovider for host: %s", err)
 	}
 	var iregion cloudprovider.ICloudRegion
 	if provider.GetFactory().IsOnPremise() {
@@ -2090,7 +2090,7 @@ func (self *SHost) GetIHostAndProvider() (cloudprovider.ICloudHost, cloudprovide
 func (self *SHost) GetIRegion() (cloudprovider.ICloudRegion, error) {
 	provider, err := self.GetDriver()
 	if err != nil {
-		return nil, fmt.Errorf("No cloudprovide for host %s: %s", self.Name, err)
+		return nil, fmt.Errorf("No cloudprovider for host %s: %s", self.Name, err)
 	}
 	region := self.GetRegion()
 	if region == nil {
@@ -2806,7 +2806,7 @@ func (self *SHost) PerformOnline(ctx context.Context, userCred mcclient.TokenCre
 
 func (self *SHost) StartSyncAllGuestsStatusTask(ctx context.Context, userCred mcclient.TokenCredential) error {
 	if task, err := taskman.TaskManager.NewTask(ctx, "BaremetalSyncAllGuestsStatusTask", self, userCred, nil, "", "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -2878,7 +2878,7 @@ func (self *SHost) StartPrepareTask(ctx context.Context, userCred mcclient.Token
 	}
 	self.SetStatus(userCred, BAREMETAL_PREPARE, "start prepare task")
 	if task, err := taskman.TaskManager.NewTask(ctx, "BaremetalPrepareTask", self, userCred, data, parentTaskId, "", nil); err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -3372,7 +3372,7 @@ func (self *SHost) PerformCacheImage(ctx context.Context, userCred mcclient.Toke
 	imageId, _ := data.GetString("image")
 	img, err := CachedimageManager.getImageInfo(ctx, userCred, imageId, false)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return nil, httperrors.NewNotFoundError("image %s not found", imageId)
 	}
 	if len(img.Checksum) != 0 && regutils.MatchUUID(img.Checksum) {

pkg/compute/models/loadbalanceracls.go

@@ -213,7 +213,7 @@ func (lbacl *SLoadbalancerAcl) GetRegion() *SCloudregion {
 func (lbacl *SLoadbalancerAcl) GetIRegion() (cloudprovider.ICloudRegion, error) {
 	provider, err := lbacl.GetDriver()
 	if err != nil {
-		return nil, fmt.Errorf("No cloudprovide for lb %s: %s", lbacl.Name, err)
+		return nil, fmt.Errorf("No cloudprovider for lb %s: %s", lbacl.Name, err)
 	}
 	region := lbacl.GetRegion()
 	if region == nil {

pkg/compute/models/loadbalancercertificates.go

@@ -272,7 +272,7 @@ func (lbcert *SLoadbalancerCertificate) GetRegion() *SCloudregion {
 func (lbcert *SLoadbalancerCertificate) GetIRegion() (cloudprovider.ICloudRegion, error) {
 	provider, err := lbcert.GetDriver()
 	if err != nil {
-		return nil, fmt.Errorf("No cloudprovide for lbcert %s: %s", lbcert.Name, err)
+		return nil, fmt.Errorf("No cloudprovider for lbcert %s: %s", lbcert.Name, err)
 	}
 	region := lbcert.GetRegion()
 	if region == nil {

pkg/compute/models/loadbalancers.go

@@ -308,7 +308,7 @@ func (lb *SLoadbalancer) GetNetwork() *SNetwork {
 func (lb *SLoadbalancer) GetIRegion() (cloudprovider.ICloudRegion, error) {
 	provider, err := lb.GetDriver()
 	if err != nil {
-		return nil, fmt.Errorf("No cloudprovide for lb %s: %s", lb.Name, err)
+		return nil, fmt.Errorf("No cloudprovider for lb %s: %s", lb.Name, err)
 	}
 	region := lb.GetRegion()
 	if region == nil {

pkg/compute/models/secgroups.go

@@ -196,7 +196,7 @@ func (self *SSecurityGroup) GetSecRules(direction string) []secrules.SecurityRul
 		//这里没必要拆分为单个单个的端口,到公有云那边适配
 		rule, err := _rule.toRule()
 		if err != nil {
-			log.Errorf(err.Error())
+			log.Errorln(err)
 			continue
 		}
 		rules = append(rules, *rule)

pkg/compute/models/skus.go

@@ -853,7 +853,7 @@ func (manager *SServerSkuManager) PendingDeleteInvalidSku() error {
 	q = q.NotIn("zone_id", sq).IsNotEmpty("zone_id")
 	err := db.FetchModelObjects(manager, q, &skus)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return httperrors.NewInternalServerError("query sku list failed.")
 	}
 
@@ -864,7 +864,7 @@ func (manager *SServerSkuManager) PendingDeleteInvalidSku() error {
 		})
 
 		if err != nil {
-			log.Errorf(err.Error())
+			log.Errorln(err)
 			return httperrors.NewInternalServerError("delete sku %s failed.", sku.Id)
 		}
 	}

pkg/compute/models/snapshots.go

@@ -395,7 +395,7 @@ func (self *SSnapshot) StartSnapshotDeleteTask(ctx context.Context, userCred mcc
 	params.Set("reload_disk", jsonutils.NewBool(reloadDisk))
 	task, err := taskman.TaskManager.NewTask(ctx, "SnapshotDeleteTask", self, userCred, params, parentTaskId, "", nil)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)
@@ -496,7 +496,7 @@ func (self *SSnapshotManager) PerformDeleteDiskSnapshots(ctx context.Context, us
 func (self *SSnapshot) StartSnapshotsDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
 	task, err := taskman.TaskManager.NewTask(ctx, "BatchSnapshotsDeleteTask", self, userCred, nil, parentTaskId, "", nil)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		return err
 	} else {
 		task.ScheduleRun(nil)

pkg/compute/tasks/baremetal_server_reset_task.go

@@ -40,7 +40,7 @@ func (self *BaremetalServerResetTask) OnInit(ctx context.Context, obj db.IStanda
 	headers := self.GetTaskRequestHeader()
 	_, err := baremetal.BaremetalSyncRequest(ctx, "POST", url, headers, nil)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 		self.SetStageFailed(ctx, err.Error())
 	} else {
 		self.SetStageComplete(ctx, nil)

pkg/hostman/hostinfo/hostinfo.go

@@ -396,7 +396,7 @@ func (h *SHostInfo) EnableNativeHugepages() error {
 			log.Errorln(err)
 			_, err = procutils.NewCommand("sh", "-c", "echo 0 > /proc/sys/vm/nr_hugepages").Run()
 			if err != nil {
-				log.Warningf(err.Error())
+				log.Warningln(err)
 			}
 			return fmt.Errorf("Failed to set native hugepages, " +
 				"the system might have run out of contiguous memory, fall back to 0")
@@ -1497,7 +1497,7 @@ func Instance() *SHostInfo {
 		var err error
 		hostInfo, err = NewHostInfo()
 		if err != nil {
-			log.Fatalf(err.Error())
+			log.Fatalln(err)
 		}
 	}
 	return hostInfo

pkg/util/aliyun/instance.go

@@ -235,7 +235,7 @@ func (self *SInstance) GetMetadata() *jsonutils.JSONDict {
 
 	tags, err := self.host.zone.region.fetchTags("instance", self.InstanceId)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 	}
 	data.Update(tags)
 

pkg/util/aws/image.go

@@ -404,7 +404,7 @@ func (self *SRegion) getImages(status ImageStatusType, owners []TImageOwnerType,
 		size, err := getRootDiskSize(image)
 		if err != nil {
 			// fail to get disk size, ignore the image
-			/// log.Debugf(err.Error())
+			/// log.Debugln(err)
 			continue
 		}
 

pkg/util/aws/instance.go

@@ -184,7 +184,7 @@ func (self *SInstance) GetMetadata() *jsonutils.JSONDict {
 	data.Add(jsonutils.NewString(priceKey), "price_key")
 	tags, err := FetchTags(self.host.zone.region.ec2Client, self.InstanceId)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 	} else {
 		data.Update(tags)
 	}

pkg/util/aws/keypair_test.go

@@ -32,7 +32,7 @@ func TestMd5Fingerprint(t *testing.T) {
 	for _, k := range testKeys {
 		fingerprint, err := md5Fingerprint(k.publickey)
 		if err != nil {
-			t.Errorf(err.Error())
+			t.Error(err)
 			continue
 		}
 

pkg/util/aws/securitygroup.go

@@ -401,7 +401,7 @@ func (self *SRegion) getSecRules(ingress []*ec2.IpPermission, egress []*ec2.IpPe
 	for _, p := range ingress {
 		ret, err := AwsIpPermissionToYunion(secrules.SecurityRuleIngress, *p)
 		if err != nil {
-			log.Debugf(err.Error())
+			log.Debugln(err)
 		}
 
 		for _, rule := range ret {
@@ -412,7 +412,7 @@ func (self *SRegion) getSecRules(ingress []*ec2.IpPermission, egress []*ec2.IpPe
 	for _, p := range egress {
 		ret, err := AwsIpPermissionToYunion(secrules.SecurityRuleEgress, *p)
 		if err != nil {
-			log.Debugf(err.Error())
+			log.Debugln(err)
 		}
 
 		for _, rule := range ret {

pkg/util/azure/debug.go

@@ -32,7 +32,7 @@ func LogRequest() autorest.PrepareDecorator {
 		return autorest.PreparerFunc(func(r *http.Request) (*http.Request, error) {
 			r, err := p.Prepare(r)
 			if err != nil {
-				log.Errorf(err.Error())
+				log.Errorln(err)
 			}
 			dump, _ := httputil.DumpRequestOut(r, true)
 			log.Errorf("%s", string(dump))
@@ -46,7 +46,7 @@ func LogResponse() autorest.RespondDecorator {
 		return autorest.ResponderFunc(func(r *http.Response) error {
 			err := p.Respond(r)
 			if err != nil {
-				log.Errorf(err.Error())
+				log.Errorln(err)
 			}
 			dump, _ := httputil.DumpResponse(r, true)
 			log.Errorf("%s", string(dump))

pkg/util/huawei/client/modules/manager_base.go

@@ -130,7 +130,7 @@ func (self *SBaseManager) jsonRequest(request requests.IRequest) (http.Header, j
 	// 拼接、编译、签名 requests here。
 	err := self.buildRequestWithSigner(request, self.signer)
 	if err != nil {
-		return nil, nil, fmt.Errorf(err.Error())
+		return nil, nil, err
 	}
 	header := http.Header{}
 	for k, v := range request.GetHeaders() {

pkg/util/huawei/disk.go

@@ -200,7 +200,7 @@ func (self *SDisk) GetExpiredAt() time.Time {
 	if self.Metadata.Billing == "1" {
 		res, err := self.storage.zone.region.GetOrderResourceDetail(self.GetId())
 		if err != nil {
-			log.Debugf(err.Error())
+			log.Debugln(err)
 		}
 
 		expiredTime = res.ExpireTime
@@ -372,7 +372,7 @@ func (self *SDisk) Detach() error {
 	return cloudprovider.WaitCreated(5*time.Second, 60*time.Second, func() bool {
 		err := self.Refresh()
 		if err != nil {
-			log.Debugf(err.Error())
+			log.Debugln(err)
 			return false
 		}
 

pkg/util/huawei/image.go

@@ -318,7 +318,7 @@ func (self *SRegion) ImportImageJob(name string, osDist string, osVersion string
 	os_version, err := stdVersion(osDist, osVersion, osArch)
 	log.Debugf("%s %s %s: %s.min_disk %d GB", osDist, osVersion, osArch, os_version, minDiskGB)
 	if err != nil {
-		log.Debugf(err.Error())
+		log.Debugln(err)
 	}
 
 	params := jsonutils.NewDict()

pkg/util/huawei/instance.go

@@ -276,7 +276,7 @@ func (self *SInstance) GetExpiredAt() time.Time {
 	if self.Metadata.ChargingMode == "1" {
 		res, err := self.host.zone.region.GetOrderResourceDetail(self.GetId())
 		if err != nil {
-			log.Debugf(err.Error())
+			log.Debugln(err)
 		}
 
 		expiredTime = res.ExpireTime
@@ -775,7 +775,7 @@ func (self *SRegion) CreateInstance(name string, imageId string, instanceType st
 
 			ids, err = self.getAllResIdsByType(_id, RESOURCE_TYPE_VM)
 			if err != nil {
-				log.Debugf(err.Error())
+				log.Debugln(err)
 				return false
 			}
 

pkg/util/qemuimg/qemuimg_test.go

@@ -25,99 +25,82 @@ func TestGetQemuImgVersion(t *testing.T) {
 func TestQcow2(t *testing.T) {
 	img, err := NewQemuImage("test")
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img.CreateQcow2(1000, true, "")
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Delete()
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img.CreateQcow2(1000, false, "")
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Convert2Qcow2(true)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Convert2Qcow2(false)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Resize(2048)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Convert2Qcow2(true)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Expand()
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Delete()
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img.CreateQcow2(1000, true, "")
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	img2, err := img.CloneQcow2("test2", true)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img2, img2.IsSparse())
 	err = img2.Delete()
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img.Convert2Qcow2(false)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	img4, err := NewQemuImage("test_top")
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img4.CreateQcow2(0, true, img.Path)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	t.Logf("%s %v", img4, img4.IsSparse())
 	err = img.Convert2Qcow2(true)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	t.Logf("%s %v", img4, img4.IsSparse())
@@ -128,36 +111,30 @@ func TestQcow2(t *testing.T) {
 func TestVhd(t *testing.T) {
 	img, err := NewQemuImage("test")
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img.CreateVhd(1024)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Delete()
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img.CreateVhd(1024)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Convert2Vhd()
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Convert2Vhd()
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	img.Delete()
@@ -166,36 +143,30 @@ func TestVhd(t *testing.T) {
 func TestVmdk(t *testing.T) {
 	img, err := NewQemuImage("test")
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img.CreateVmdk(1024, true)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Delete()
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	err = img.CreateVmdk(1024, false)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Convert2Vmdk(true)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	err = img.Convert2Vmdk(false)
 	if err != nil {
-		t.Errorf(err.Error())
-		return
+		t.Fatal(err)
 	}
 	t.Logf("%s %v", img, img.IsSparse())
 	img.Delete()

pkg/util/ucloud/disk.go

@@ -155,7 +155,7 @@ func (self *SDisk) GetTemplateId() string {
 	if strings.Contains(self.DiskType, "SystemDisk") && len(self.UHostID) > 0 {
 		ins, err := self.storage.zone.region.GetInstanceByID(self.UHostID)
 		if err != nil {
-			log.Errorf(err.Error())
+			log.Errorln(err)
 		}
 
 		return ins.ImageID

pkg/util/ucloud/instance.go

@@ -67,8 +67,7 @@ type SInstance struct {
 func (self *SInstance) GetSecurityGroupIds() ([]string, error) {
 	secgroups, err := self.GetSecurityGroups()
 	if err != nil {
-		log.Errorf(err.Error())
-		return nil, err
+		log.Errorln(err)
 	}
 
 	secgroupIds := make([]string, 0)

pkg/util/ucloud/securitygroup.go

@@ -120,7 +120,7 @@ func (self *SSecurityGroup) UcloudSecRuleToOnecloud(rule Rule) secrules.Security
 
 	_, ipNet, err := net.ParseCIDR(rule.SrcIP)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorln(err)
 	}
 
 	secrule.IPNet = ipNet
@@ -133,18 +133,18 @@ func (self *SSecurityGroup) UcloudSecRuleToOnecloud(rule Rule) secrules.Security
 		segs := strings.Split(rule.DstPort, "-")
 		s, err := strconv.Atoi(segs[0])
 		if err != nil {
-			log.Errorf(err.Error())
+			log.Errorln(err)
 		}
 		e, err := strconv.Atoi(segs[1])
 		if err != nil {
-			log.Errorf(err.Error())
+			log.Errorln(err)
 		}
 		secrule.PortStart = s
 		secrule.PortEnd = e
 	} else {
 		port, err := strconv.Atoi(rule.DstPort)
 		if err != nil {
-			log.Errorf(err.Error())
+			log.Errorln(err)
 		}
 
 		secrule.PortStart = port

vendor/yunion.io/x/log/log.go

@@ -83,18 +83,34 @@ func Debugf(format string, args ...interface{}) {
 	logrus.Debugf(format, args...)
 }
 
+func Debugln(args ...interface{}) {
+	logrus.Debugln(args...)
+}
+
 func Printf(format string, args ...interface{}) {
 	logrus.Printf(format, args...)
 }
 
+func Println(args ...interface{}) {
+	logrus.Println(args...)
+}
+
 func Infof(format string, args ...interface{}) {
 	logrus.Infof(format, args...)
 }
 
+func Infoln(args ...interface{}) {
+	logrus.Infoln(args...)
+}
+
 func Warningf(format string, args ...interface{}) {
 	logrus.Warnf(format, args...)
 }
 
+func Warningln(args ...interface{}) {
+	logrus.Warnln(args...)
+}
+
 func Errorf(format string, args ...interface{}) {
 	logrus.Errorf(format, args...)
 }
@@ -107,6 +123,10 @@ func Fatalf(format string, args ...interface{}) {
 	logrus.Fatalf(format, args...)
 }
 
+func Fatalln(args ...interface{}) {
+	logrus.Fatalln(args...)
+}
+
 func AddHookFormatter(logger *logrus.Logger) {
 	logger.Hooks.Add(new(hooks.CallerHook))