Browse code

Merge pull request #11106 from MabinGo/fix_log_info

Fix some revision about log output

Alexander Morozov authored on 2015/03/03 06:55:43
Showing 1 changed files
... ...
@@ -1111,7 +1111,7 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error {
1111 1111
 }
1112 1112
 
1113 1113
 func (devices *DeviceSet) AddDevice(hash, baseHash string) error {
1114
-	log.Debugf("[deviceset] AddDevice() hash=%s basehash=%s", hash, baseHash)
1114
+	log.Debugf("[deviceset] AddDevice(hash=%s basehash=%s)", hash, baseHash)
1115 1115
 	defer log.Debugf("[deviceset] AddDevice(hash=%s basehash=%s) END", hash, baseHash)
1116 1116
 
1117 1117
 	baseInfo, err := devices.lookupDevice(baseHash)
... ...
@@ -1325,9 +1325,9 @@ func (devices *DeviceSet) waitClose(info *DevInfo) error {
1325 1325
 }
1326 1326
 
1327 1327
 func (devices *DeviceSet) Shutdown() error {
1328
-	log.Debugf("[deviceset %s] shutdown()", devices.devicePrefix)
1328
+	log.Debugf("[deviceset %s] Shutdown()", devices.devicePrefix)
1329 1329
 	log.Debugf("[devmapper] Shutting down DeviceSet: %s", devices.root)
1330
-	defer log.Debugf("[deviceset %s] shutdown END", devices.devicePrefix)
1330
+	defer log.Debugf("[deviceset %s] Shutdown() END", devices.devicePrefix)
1331 1331
 
1332 1332
 	var devs []*DevInfo
1333 1333
 
... ...
@@ -1394,7 +1394,7 @@ func (devices *DeviceSet) MountDevice(hash, path, mountLabel string) error {
1394 1394
 
1395 1395
 	if info.mountCount > 0 {
1396 1396
 		if path != info.mountPath {
1397
-			return fmt.Errorf("Trying to mount devmapper device in multple places (%s, %s)", info.mountPath, path)
1397
+			return fmt.Errorf("Trying to mount devmapper device in multiple places (%s, %s)", info.mountPath, path)
1398 1398
 		}
1399 1399
 
1400 1400
 		info.mountCount++