Build fix after r196870.

* public/include/report-processor.php:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@197904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index 10b80dad569743f79fd5087a8b2a692e79308044..6429f6774dd008b233d698752be6d1f6ea7d3624 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Build fix after r196870.
+
+        * public/include/report-processor.php:
+
 2016-03-09  Ryosuke Niwa  <rniwa@webkit.org>
 
         Add Size metric to perf dashboard

diff --git a/Websites/perf.webkit.org/public/include/report-processor.php b/Websites/perf.webkit.org/public/include/report-processor.php
index 9fc93bdecd7900520429574476d54eab56e4d7aa..b58ca8115e228b7cabc4a21136350d9d991c6c08 100644 (file)
--- a/Websites/perf.webkit.org/public/include/report-processor.php
+++ b/Websites/perf.webkit.org/public/include/report-processor.php
@@ -63,18 +63,18 @@ class ReportProcessor {
             $hash = NULL;
             if ($slave_name && array_key_exists('slavePassword', $report)) {
                 $universal_password = config('universalSlavePassword');
-                if ($universal_password && $universal_password == $report['slavePassword'])
-                    $slave = $this->db->select_first_row('build_slaves', 'slave', array('name' => $slave_name));
+                if ($slave_name && $universal_password && $universal_password == $report['slavePassword'])
+                    $slave_id = $this->db->select_or_insert_row('build_slaves', 'slave', array('name' => $slave_name));
                 else {
                     $hash = hash('sha256', $report['slavePassword']);
                     $slave = $this->db->select_first_row('build_slaves', 'slave', array('name' => $slave_name, 'password_hash' => $hash));
+                    if ($slave)
+                        $slave_id = $slave['slave_id'];
                 }
-                if ($slave)
-                    $slave_id = $slave['slave_id'];
             } else if (array_key_exists('builderPassword', $report))
                 $hash = hash('sha256', $report['builderPassword']);
 
-            if (!$hash)
+            if (!$hash && !$slave_id)
                 $this->exit_with_error('BuilderNotFound');
             if (!$slave_id)
                 $builder_info['password_hash'] = $hash;