From patchwork Thu Apr 5 12:58:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 1/1] diskspace monitor: assign a default value when only of the interval is set Date: Thu, 05 Apr 2012 12:58:57 -0000 From: Robert Yang X-Patchwork-Id: 25201 Message-Id: <65fa6134831ad83875028334074664a86aaf7ea0.1333630624.git.liezhi.yang@windriver.com> To: Assign a default value to the other one when either disk space interval or amount of inodes interval value is set for example: BB_DISKMON_WARNINTERVAL = "50M," or BB_DISKMON_WARNINTERVAL = ",5K" The diskspace monitor would not enable in the past, that seemed unreasonable, assign a default value to the other one currently, so the monitor will be enabled, and will warn both of diskspace and free amount of inode if they have been set in BB_DISKMON_DIRS. Signed-off-by: Robert Yang --- bitbake/lib/bb/monitordisk.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/monitordisk.py b/bitbake/lib/bb/monitordisk.py index 9baba5e..9469193 100644 --- a/bitbake/lib/bb/monitordisk.py +++ b/bitbake/lib/bb/monitordisk.py @@ -136,10 +136,13 @@ def getInterval(configuration): """ Get the disk space interval """ + # The default value is 50M and 5K. + spaceDefault = 50 * 1024 * 1024 + inodeDefault = 5 * 1024 + interval = configuration.getVar("BB_DISKMON_WARNINTERVAL", True) if not interval: - # The default value is 50M and 5K. - return 50 * 1024 * 1024, 5 * 1024 + return spaceDefault, inodeDefault else: # The disk space or inode interval is optional, but it should # have a correct value once it is specified @@ -151,12 +154,16 @@ def getInterval(configuration): if not intervalSpace: printErr("Invalid disk space interval value in BB_DISKMON_WARNINTERVAL: %s" % intervalRe.group(1)) return None, None + else: + intervalSpace = spaceDefault intervalInode = intervalRe.group(2) if intervalInode: intervalInode = convertGMK(intervalInode) if not intervalInode: printErr("Invalid disk inode interval value in BB_DISKMON_WARNINTERVAL: %s" % intervalRe.group(2)) return None, None + else: + intervalInode = inodeDefault return intervalSpace, intervalInode else: printErr("Invalid interval value in BB_DISKMON_WARNINTERVAL: %s" % interval)