浏览代码

devmapper: initialize log levels

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Vincent Batts 10 年之前
父节点
当前提交
0c8be9da37
共有 1 个文件被更改,包括 9 次插入2 次删除
  1. 9 2
      daemon/graphdriver/devmapper/deviceset.go

+ 9 - 2
daemon/graphdriver/devmapper/deviceset.go

@@ -717,8 +717,10 @@ func setCloseOnExec(name string) {
 }
 }
 
 
 func (devices *DeviceSet) DMLog(level int, file string, line int, dmError int, message string) {
 func (devices *DeviceSet) DMLog(level int, file string, line int, dmError int, message string) {
-	if level >= 7 {
-		return // Ignore _LOG_DEBUG
+	if level >= devicemapper.LogLevelDebug {
+		// (vbatts) libdm debug is very verbose. If you're debugging libdm, you can
+		// comment out this check yourself
+		level = devicemapper.LogLevelInfo
 	}
 	}
 
 
 	// FIXME(vbatts) push this back into ./pkg/devicemapper/
 	// FIXME(vbatts) push this back into ./pkg/devicemapper/
@@ -939,6 +941,11 @@ func (devices *DeviceSet) closeTransaction() error {
 }
 }
 
 
 func (devices *DeviceSet) initDevmapper(doInit bool) error {
 func (devices *DeviceSet) initDevmapper(doInit bool) error {
+	if os.Getenv("DEBUG") != "" {
+		devicemapper.LogInitVerbose(devicemapper.LogLevelDebug)
+	} else {
+		devicemapper.LogInitVerbose(devicemapper.LogLevelWarn)
+	}
 	// give ourselves to libdm as a log handler
 	// give ourselves to libdm as a log handler
 	devicemapper.LogInit(devices)
 	devicemapper.LogInit(devices)