Title: [197904] trunk/Websites/perf.webkit.org
- Revision
- 197904
- Author
- [email protected]
- Date
- 2016-03-09 17:02:35 -0800 (Wed, 09 Mar 2016)
Log Message
Build fix after r196870.
* public/include/report-processor.php:
Modified Paths
Diff
Modified: trunk/Websites/perf.webkit.org/ChangeLog (197903 => 197904)
--- trunk/Websites/perf.webkit.org/ChangeLog 2016-03-10 01:00:14 UTC (rev 197903)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-03-10 01:02:35 UTC (rev 197904)
@@ -1,5 +1,11 @@
2016-03-09 Ryosuke Niwa <[email protected]>
+ Build fix after r196870.
+
+ * public/include/report-processor.php:
+
+2016-03-09 Ryosuke Niwa <[email protected]>
+
Add Size metric to perf dashboard
https://bugs.webkit.org/show_bug.cgi?id=155266
Modified: trunk/Websites/perf.webkit.org/public/include/report-processor.php (197903 => 197904)
--- trunk/Websites/perf.webkit.org/public/include/report-processor.php 2016-03-10 01:00:14 UTC (rev 197903)
+++ trunk/Websites/perf.webkit.org/public/include/report-processor.php 2016-03-10 01:02:35 UTC (rev 197904)
@@ -63,18 +63,18 @@
$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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
