Added support for post-processing of relayed tests

klepikov · Aug 13, 2013 · 198f692 · 198f692
1 parent da2afb6
commit 198f692
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/www/lib/tsview.inc.php b/www/lib/tsview.inc.php
@@ -4,7 +4,7 @@
 */
 function TSViewPostResult(&$test, $id, $testPath, $server, $tsview_name) {
   require_once('page_data.inc');
-  
+
   $runs = $test['runs'];
   if (array_key_exists('discard', $test) &&
       $test['discard'] > 0 &&
@@ -72,6 +72,8 @@ function TSViewPostResult(&$test, $id, $testPath, $server, $tsview_name) {
 
 function TSViewCreate($server, $tsview_name, &$metrics) {
   $needs_update = false;
+  if (!is_dir('./dat'))
+    mkdir('./dat', 0777, true);
   $def = './dat/tsview-' . sha1($tsview_name) . '.json';
   if ($lock = fopen("$def.lock", 'w')) {
     if (flock($lock, LOCK_EX)) {

diff --git a/www/runtest.php b/www/runtest.php
@@ -137,7 +137,7 @@ function DealWithMagicQuotes(&$arr) {
             $test['clearcerts'] = array_key_exists('clearcerts', $_REQUEST) && $_REQUEST['clearcerts'] ? 1 : 0;
             $test['orientation'] = array_key_exists('orientation', $_REQUEST) ? trim($_REQUEST['orientation']) : 'default';
             if (array_key_exists('tsview_id', $_REQUEST))
-              $test['tsview_id'] = $_REQUEST('tsview_id');
+              $test['tsview_id'] = $_REQUEST['tsview_id'];
 
             // custom options
             $test['cmdLine'] = '';

diff --git a/www/testStatus.inc b/www/testStatus.inc
@@ -267,8 +267,7 @@ function GetRelayStatus($id, $testPath, &$test) {
                 $zip = new ZipArchive();
                 if ($zip->open($tmp) === true) {
                     if ($zip->extractTo($testPath)) {
-                        require_once('archive.inc');
-                        ArchiveTest($id);
+                        SendAsyncRequest("/work/postprocess.php?test=$id");
                         http_fetch("{$server}delete.php?test=$id&rkey=$key");
                         $ret = $status['data'];
                     }
@@ -348,6 +347,7 @@ function GetAppurifyStatus($id, $testPath, &$test) {
           $ret['statusCode'] = 200;
           $ret['statusText'] = 'Test Complete';
           $ret['completeTime'] = $date;
+          SendAsyncRequest("/work/postprocess.php?test=$id");
         } elseif ($started) {
           $ret['statusCode'] = 100;
           $ret['statusText'] = 'Test Started';

diff --git a/www/work/postprocess.php b/www/work/postprocess.php
@@ -65,10 +65,10 @@
     $testInfo = json_decode(gz_file_get_contents("$testPath/testinfo.json"), true);
 
     // post the test to tsview if requested
+    $tsviewdb = GetSetting('tsviewdb');
     if (array_key_exists('tsview_id', $testInfo) &&
         strlen($testInfo['tsview_id']) &&
-        array_key_exists('tsviewdb', $settings) &&
-        strlen($settings['tsviewdb']) &&
+        strlen($tsviewdb) &&
         is_file('./lib/tsview.inc.php')) {
       require_once('./lib/tsview.inc.php');
       TSViewPostResult($testInfo, $id, $testPath, $settings['tsviewdb'], $testInfo['tsview_id']);