SF.net SVN: logwatch:[326] trunk/scripts/services/zz-disk_space

Revision: 326
          http://sourceforge.net/p/logwatch/code/326
Author:   stefjakobs
Date:     2016-02-20 21:22:38 +0000 (Sat, 20 Feb 2016)
Log Message:
-----------
Bug #44: no disk full warning if $DETAIL low

Modified Paths:
--------------
    trunk/scripts/services/zz-disk_space

Modified: trunk/scripts/services/zz-disk_space
===================================================================
--- trunk/scripts/services/zz-disk_space	2016-02-20 21:13:23 UTC (rev 325)
+++ trunk/scripts/services/zz-disk_space	2016-02-20 21:22:38 UTC (rev 326)
@@ -121,53 +121,7 @@
 
 sub DiskSpace ()
 {
-	if ($OSname eq "Linux") {
-		$df_options = "-h -x tmpfs -x udf -x iso9660";
-		if ($local_disks_only) { $df_options .= " -l"; }
-	} elsif ($OSname eq "Darwin") {
-		$df_options = "-h";
-		if ($local_disks_only) { $df_options .= " -l"; }
-	} elsif ($OSname eq "SunOS") {
-		if ( ($release eq "5.10") || ($release eq "5.9") || ($release eq "5.11") ) {
-			$df_options = "-h";
-		} 
-		if ($local_disks_only) { $df_options .= " -l"; }
-	} elsif ($OSname eq "HP-UX") {
-		$df_options = "";
-		if ($local_disks_only) { $df_options .= " -l"; }
-	} elsif ($OSname eq "AIX") {
-		$df_options = "";
-		if ($local_disks_only) { $df_options .= " -P"; }
-	} elsif ($OSname eq "GNU/kFreeBSD") {
-		$df_options = "-h -x tmpfs -x udf -x iso9660 -x devfs -x linprocfs -x sysfs -x fdescfs";
-		if ($local_disks_only) { $df_options .= " -l"; }
-	} else {
-		$df_options = "";
-		if ($local_disks_only) { $df_options .= " -l"; }
-	}
-
-	if ( $ENV{'df_options'} ) {
-		$df_options = $ENV{'df_options'};
-	};
-
-	if ($OSname eq "Linux") {
-		$disk_cmd = "df $df_options";
-	} elsif ($OSname eq "Darwin") {
-		$disk_cmd = "df $df_options";
-	} elsif ($OSname eq "SunOS") {
-		$disk_cmd = "/usr/xpg4/bin/df $df_options";
-	} elsif ($OSname eq "HP-UX") {
-		$disk_cmd = "bdf $df_options";
-	} else {
-		$disk_cmd = "df $df_options";
-	}
-
-	if ( $ENV{'disk_cmd'} ) {
-		$disk_cmd = $ENV{'disk_cmd'};
-	};
-
 	system($disk_cmd);
-
 	print "\n";
 }
 
@@ -188,6 +142,51 @@
 #####################
 #Main
 
+if ($OSname eq "Linux") {
+	$df_options = "-h -x tmpfs -x udf -x iso9660";
+	if ($local_disks_only) { $df_options .= " -l"; }
+} elsif ($OSname eq "Darwin") {
+	$df_options = "-h";
+	if ($local_disks_only) { $df_options .= " -l"; }
+} elsif ($OSname eq "SunOS") {
+	if ( ($release eq "5.10") || ($release eq "5.9") || ($release eq "5.11") ) {
+		$df_options = "-h";
+	} 
+	if ($local_disks_only) { $df_options .= " -l"; }
+} elsif ($OSname eq "HP-UX") {
+	$df_options = "";
+	if ($local_disks_only) { $df_options .= " -l"; }
+} elsif ($OSname eq "AIX") {
+	$df_options = "";
+	if ($local_disks_only) { $df_options .= " -P"; }
+} elsif ($OSname eq "GNU/kFreeBSD") {
+	$df_options = "-h -x tmpfs -x udf -x iso9660 -x devfs -x linprocfs -x sysfs -x fdescfs";
+	if ($local_disks_only) { $df_options .= " -l"; }
+} else {
+	$df_options = "";
+	if ($local_disks_only) { $df_options .= " -l"; }
+}
+
+if ( $ENV{'df_options'} ) {
+	$df_options = $ENV{'df_options'};
+};
+
+if ($OSname eq "Linux") {
+	$disk_cmd = "df $df_options";
+} elsif ($OSname eq "Darwin") {
+	$disk_cmd = "df $df_options";
+} elsif ($OSname eq "SunOS") {
+	$disk_cmd = "/usr/xpg4/bin/df $df_options";
+} elsif ($OSname eq "HP-UX") {
+	$disk_cmd = "bdf $df_options";
+} else {
+	$disk_cmd = "df $df_options";
+}
+
+if ( $ENV{'disk_cmd'} ) {
+	$disk_cmd = $ENV{'disk_cmd'};
+};
+
 #Only show disk space "df" by default -mgt
 DiskSpace() if (($ENV{PRINTING} eq 'y') or $Detail);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140