nav_cricket-1.0.3_v0.2.alfa.patch

Network Administration Visualized 网络管理可视化源码

Index: compile
===================================================================
--- compile	(.../vendor/cricket/1.0.3)	(revision 9)
+++ compile	(.../nav/cricket)	(revision 9)
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 # -*- perl -*-
 
 # Cricket: a configuration, polling and data display wrapper for RRD files
@@ -66,16 +66,22 @@
 
 sub check_and_set_lock {
 	my $lockfile = $gCT->Base() . "/config.db.lock";
-	if (-f $lockfile) {
-		my($db_mtime) = (stat($lockfile))[9];
-		# Do not recompile if another process already is busy compiling
-		if ((time() - $db_mtime) < 900) {
-			Warn("Skipping recompile; already in progress");
-			return 1;
-		} else {  
-			# But warn if that other process is dead
-			Warn("Forcing recompile; previous compile aborted?");
-		}
+	my $tries = 0;
+	while (-f $lockfile) {
+	    my($db_mtime) = (stat($lockfile))[9];
+	    # Do not recompile if another process already is busy compiling
+	    if ((time() - $db_mtime) < 900) {
+		++$tries >= 5 && do { 
+		    Warn("Skipping recompile; already in progress");
+		    return 1;
+		};
+		Warn("Lockfile found, sleeping 5 secs.");
+		sleep(5);
+	    } else {
+		# But warn if that other process is dead
+		Warn("Forcing recompile; previous compile aborted?");
+		unlink $lockfile;
+	    }
 	}
 	open(LOCK, ">$lockfile") || die "Can't create $lockfile";
 	print LOCK "$$\n";
Index: grapher.cgi
===================================================================
--- grapher.cgi	(.../vendor/cricket/1.0.3)	(revision 9)
+++ grapher.cgi	(.../nav/cricket)	(revision 9)
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 # -*- perl -*-
 
 # Cricket: a configuration, polling and data display wrapper for RRD files
@@ -388,7 +388,7 @@
                     $label = rangeToLabel($range);
                 }
                 print "<h3>$label graph${plural}</h3>\n";
-
+                
                 #
                 # If we have this, we should use it
                 #
@@ -518,22 +518,70 @@
                     my($format) = graphParam($gRef, 'graph-format', $defFmt);
 
                     my($cache) = $gQ->param('cache');
+                    
+                    ##################################################
+                    # Edited by John Magne Bredal <[e-mail]>
+                    # for NAV-v3 ITEA NTNU