[Ganglia-svn] SF.net SVN: ganglia: [1213] trunk/monitor-core/web/graph.php

[<ha...@us...>]

Revision: 1213
          http://ganglia.svn.sourceforge.net/ganglia/?rev=1213&view=rev
Author:   hawson
Date:     2008-04-04 20:22:11 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Add slightly better debug handling.  A "debug=X" CGI parameter can
now be included in graphs, where "X" is the debug level.  The default
is zero, which indicates no debugging (specifiying "debug=0" is
valid).  In theory, any URL should be able to tack "debug=X" onto
the end, and messages will magically appear in the error_log file
to help with troubleshooting.

Modified Paths:
--------------
    trunk/monitor-core/web/graph.php

Modified: trunk/monitor-core/web/graph.php
===================================================================
--- trunk/monitor-core/web/graph.php	2008-04-05 03:08:49 UTC (rev 1212)
+++ trunk/monitor-core/web/graph.php	2008-04-05 03:22:11 UTC (rev 1213)
@@ -28,7 +28,7 @@
                                  ?  sanitize ( $_GET["l"] )   : NULL;
 
 $summary    = isset( $_GET["su"] )    ? 1 : 0;
-$debug      = isset( $_GET['debug'] ) ? 1 : 0;
+$debug      = isset( $_GET['debug'] ) ? clean_number ( sanitize( $_GET["debug"] ) ) :  0;
 $command    = '';
 
 # Assumes we have a $start variable (set in get_context.php).
@@ -82,9 +82,10 @@
     'height' => $height,
 );
 
+if ($debug) {
+    error_log("Graph [$graph] in context [$context]");
+}
 
-//error_log("Graph [$graph] in context [$context]");
-
 /* If we have $graph, then a specific report was requested, such as "network_report" or 
  * "cpu_report.  These graphs usually have some special logic and custom handling required,
  * instead of simply plotting a single metric.  If $graph is not set, then we are (hopefully),
@@ -214,21 +215,17 @@
 //error_log("Final command:  $command");
 
 # Did we generate a command?   Run it.
-if($command)
- {
-   /*Make sure the image is not cached*/
-   header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");   // Date in the past
-   header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); // always modified
-   header ("Cache-Control: no-cache, must-revalidate");   // HTTP/1.1
-   header ("Pragma: no-cache");                     // HTTP/1.0
-   if ($debug) {
-     header ("Content-type: text/html");
-     print htmlentities( $command ) . "\n\n\n\n\n";
+if($command) {
+    /*Make sure the image is not cached*/
+    header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");   // Date in the past
+    header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); // always modified
+    header ("Cache-Control: no-cache, must-revalidate");   // HTTP/1.1
+    header ("Pragma: no-cache");                     // HTTP/1.0
+    if ($debug>2) {
+        print htmlentities( $command ) . "\n\n\n\n\n";
     }
-   else {
-     header ("Content-type: image/gif");
-     passthru($command);
-    }
- }
+    header ("Content-type: image/gif");
+    passthru($command);
+}
 
 ?>


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