Enabled HTTP chunked transfer encoding

[ampy.git] / html / currentjson_chunked.php

diff --git a/html/currentjson_chunked.php b/html/currentjson_chunked.php
index a860df51b596268dc1bb6083d1189a5c94c6c837..7772479e7ffc7ebec4dd384c2842e24fdab9fb15 100644 (file)
--- a/html/currentjson_chunked.php
+++ b/html/currentjson_chunked.php
@@ -3,9 +3,15 @@
  * Experimental version that return chunked http response.
  *
  * Pulling the values is no longer needed as the one request will output
- * the updates every 10 seconds.
+ * the updates every second.
  */
 require_once('config.php');
+require_once("ampy.inc.php");
+
+$speed=@(int)$_GET['speed'];
+if ($speed <= 0)
+       $speed=1;  // seconds
+
 
 header("Content-Type: text/json");
 header("Transfer-Encoding: chunked");
@@ -16,13 +22,16 @@ flush();
 function send_chunk($chunk)
 {
        // The chunk must fill the output buffer or php won't send it
-       $chunk = str_pad($chunk, 4096);
+       //$chunk = str_pad($chunk, 4096);
 
        printf("%x\r\n%s\r\n", strlen($chunk), $chunk);
        flush();
+       ob_flush();
 }
 
 while (True) {
+       ampy_flush_rrd_daemon();
+
        $info=rrd_lastupdate(RRDFILE);
        if ($info === FALSE)
                $result=[
@@ -33,9 +42,10 @@ while (True) {
        else
                $result=[
                        'last_update' => $info['last_update'],
-                       'watts' => $info['data'][0]
+                       'watts' => (float)$info['data'][0],
                ];
+       $result['counter'] = ampy_get_counter();
        send_chunk(json_encode($result));
-       sleep(10);
+       sleep($speed);
 }
 ?>