Add a configuration option for sync/async choice for the canvas graphs

5 files changed, 56 insertions, 22 deletions

diff --git a/conf/config.php b/conf/config.php
index 26172b1..b808a70 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -45,6 +45,9 @@ $CONFIG['network_datasize'] = 'bytes';
 # png or canvas graphs
 $CONFIG['graph_type'] = 'png';
 
+# For canvas graphs, use 'async' or 'sync' fetch method
+$CONFIG['rrd_fetch_method'] = 'sync';
+
 # use the negative X-axis in I/O graphs
 $CONFIG['negative_io'] = false;
 
diff --git a/inc/html.inc.php b/inc/html.inc.php
index 478045c..b07be8a 100644
--- a/inc/html.inc.php
+++ b/inc/html.inc.php
@@ -87,6 +87,17 @@ EOT;
 <script type="text/javascript" src="{$CONFIG['weburl']}js/CGP.js"></script>
 
 EOT;
+                if ($CONFIG['rrd_fetch_method'] == 'async') {
+                echo <<<EOT
+<script type="text/javascript" src="{$CONFIG['weburl']}js/CGP-async.js"></script>
+
+EOT;
+                } else {
+                echo <<<EOT
+<script type="text/javascript" src="{$CONFIG['weburl']}js/CGP-sync.js"></script>
+
+EOT;
+                }
         }
 
 echo <<<EOT
diff --git a/js/CGP-async.js b/js/CGP-async.js
new file mode 100644
index 0000000..4976509
--- /dev/null
+++ b/js/CGP-async.js
@@ -0,0 +1,21 @@
+function draw(id) {
+        var rrdgraph = prepare_draw(id);
+
+        try {
+                rrdgraph.graph_paint_async();
+        } catch (e) {
+                alert(e+"\n"+e.stack);
+        }
+}
+
+function drawAll()
+{
+        var list=[];
+        var a=document.getElementsByClassName('rrd');
+        for (var i=0,l=a.length;i<l;i++)
+        {
+                draw(a[i].getAttribute('id'))
+        }
+}
+
+window.onload = drawAll()
diff --git a/js/CGP-sync.js b/js/CGP-sync.js
new file mode 100644
index 0000000..01f6b19
--- /dev/null
+++ b/js/CGP-sync.js
@@ -0,0 +1,21 @@
+function draw(id) {
+        var rrdgraph = prepare_draw(id);
+
+        try {
+                rrdgraph.graph_paint();
+        } catch (e) {
+                alert(e+"\n"+e.stack);
+        }
+}
+
+function drawAll()
+{
+        var list=[];
+        var a=document.getElementsByClassName('rrd');
+        for (var i=0,l=a.length;i<l;i++)
+        {
+                draw(a[i].getAttribute('id'))
+        }
+}
+
+window.onload = drawAll()
diff --git a/js/CGP.js b/js/CGP.js
index add1a20..bbfd1b5 100644
--- a/js/CGP.js
+++ b/js/CGP.js
@@ -106,25 +106,3 @@ function prepare_draw(id) {
 
         return rrdgraph;
 }
-
-function draw(id) {
-        var rrdgraph = prepare_draw(id);
-
-        try {
-                rrdgraph.graph_paint();
-        } catch (e) {
-                alert(e+"\n"+e.stack);
-        }
-}
-
-function drawAll()
-{
-        var list=[];
-        var a=document.getElementsByClassName('rrd');
-        for (var i=0,l=a.length;i<l;i++)
-        {
-                draw(a[i].getAttribute('id'))
-        }
-}
-
-window.onload = drawAll()