Minor source code cleanups

This commit is contained in:
Eldad Fux committed 2020-03-25 07:03:01 +02:00
1 parent 52acf5e8f8
commit 73d9bbb446
3 files changed
-18

No files matched your search

View File
Whitespace-only changes.
-1
View File
@@ -1 +0,0 @@
{"psp":{"monitors":[{"id":778638622,"friendly_name":"API","customuptimeranges":[{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"}],"oneWeekRange":{"label":"success","ratio":"100.00"},"typeStr":"http","intervalMin":5,"allLogs":[{"statusStr":"up","durationStr":"1988 hrs, 21 mins.","dateTimeStr":"2018-10-05 09:00:19","reasonStr":"Connection Timeout","reasonTitle":"Connection Timeout","label":"success","timestamp":1538722819000},{"statusStr":"down","durationStr":"0 hrs, 1 mins.","dateTimeStr":"2018-12-27 05:21:50","reasonStr":"Service Unavailable","reasonTitle":"Service Unavailable","label":"danger","timestamp":1545880910000},{"statusStr":"up","durationStr":"1277 hrs, 57 mins.","dateTimeStr":"2018-12-27 05:23:49","reasonStr":"OK","reasonTitle":"OK","label":"success","timestamp":1545881029000},{"statusStr":"down","durationStr":"0 hrs, 3 mins.","dateTimeStr":"2019-02-18 11:21:09","reasonStr":"Connection Timeout","reasonTitle":"Connection Timeout","label":"danger","timestamp":1550481669000},{"statusStr":"up","durationStr":"573 hrs, 11 mins.","dateTimeStr":"2019-02-18 11:24:10","reasonStr":"OK","reasonTitle":"OK","label":"success","timestamp":1550481850000}],"status":2,"statusLabel":"success","statusNumber":2},{"id":778472755,"friendly_name":"Cache","customuptimeranges":[{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"}],"oneWeekRange":{"label":"success","ratio":"100.00"},"typeStr":"http","intervalMin":5,"allLogs":[{"statusStr":"up","durationStr":"1989 hrs, 0 mins.","dateTimeStr":"2018-10-05 08:21:57","reasonStr":"Connection Timeout","reasonTitle":"Connection Timeout","label":"success","timestamp":1538720517000},{"statusStr":"down","durationStr":"0 hrs, 0 mins.","dateTimeStr":"2018-12-27 05:22:28","reasonStr":"Service Unavailable","reasonTitle":"Service Unavailable","label":"danger","timestamp":1545880948000},{"statusStr":"up","durationStr":"1277 hrs, 57 mins.","dateTimeStr":"2018-12-27 05:23:14","reasonStr":"OK","reasonTitle":"OK","label":"success","timestamp":1545880994000},{"statusStr":"down","durationStr":"0 hrs, 3 mins.","dateTimeStr":"2019-02-18 11:20:21","reasonStr":"Not Found","reasonTitle":"Not Found","label":"danger","timestamp":1550481621000},{"statusStr":"up","durationStr":"573 hrs, 12 mins.","dateTimeStr":"2019-02-18 11:23:22","reasonStr":"OK","reasonTitle":"OK","label":"success","timestamp":1550481802000}],"status":2,"statusLabel":"success","statusNumber":2},{"id":778472750,"friendly_name":"Console","customuptimeranges":[{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"}],"oneWeekRange":{"label":"success","ratio":"100.00"},"typeStr":"http","intervalMin":5,"allLogs":[{"statusStr":"up","durationStr":"1989 hrs, 0 mins.","dateTimeStr":"2018-10-05 08:21:57","reasonStr":"Connection Timeout","reasonTitle":"Connection Timeout","label":"success","timestamp":1538720517000},{"statusStr":"down","durationStr":"0 hrs, 0 mins.","dateTimeStr":"2018-12-27 05:22:53","reasonStr":"Service Unavailable","reasonTitle":"Service Unavailable","label":"danger","timestamp":1545880973000},{"statusStr":"up","durationStr":"1851 hrs, 11 mins.","dateTimeStr":"2018-12-27 05:23:50","reasonStr":"OK","reasonTitle":"OK","label":"success","timestamp":1545881030000}],"status":2,"statusLabel":"success","statusNumber":2},{"id":778472751,"friendly_name":"DB","customuptimeranges":[{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"},{"label":"success","ratio":"100.00"}],"oneWeekRange":{"label":"success","ratio":"100.00"},"typeStr":"http","intervalMin":5,"allLogs":[{"statusStr":"up","durationStr":"3037 hrs, 27 mins.","dateTimeStr":"2018-10-05 08:21:57","reasonStr":"Connection Timeout","reasonTitle":"Connection Timeout","label":"success","timestamp":1538720517000},{"statusStr":"down","durationStr":"0 hrs, 1 mins.","dateTimeStr":"2019-02-08 21:49:52","reasonStr":"Not Found","reasonTitle":"Not Found","label":"danger","timestamp":1549655392000},{"statusStr":"up","durationStr":"229 hrs, 31 mins.","dateTimeStr":"2019-02-08 21:51:41","reasonStr":"OK","reasonTitle":"OK","label":"success","timestamp":1549655501000},{"statusStr":"down","durationStr":"0 hrs, 2 mins.","dateTimeStr":"2019-02-18 11:22:55","reasonStr":"Not Found","reasonTitle":"Not Found","label":"danger","timestLine truncated
-17
View File
@@ -588,23 +588,6 @@ class MySQL extends Adapter
// Search
if (!empty($options['search'])) { // Handle free search
// $where[] = "LEFT JOIN `" . $this->getNamespace() . ".database.properties` b_search ON a.uid IS NOT NULL AND b_search.documentUid = a.uid
// LEFT JOIN
// `" . $this->getNamespace() . ".database.relationships` c_search ON c_search.start = a.uid
// LEFT JOIN
// `" . $this->getNamespace() . ".database.properties` d_search ON d_search.documentUid = c_search.end
// LEFT JOIN
// `" . $this->getNamespace() . ".database.relationships` e_search ON e_search.start = c_search.end
// LEFT JOIN
// `" . $this->getNamespace() . ".database.properties` f_search ON f_search.documentUid = e_search.end
// \n";
// $search = "AND (MATCH (b_search.value) AGAINST ({$this->getPDO()->quote($options['search'], PDO::PARAM_STR)} IN BOOLEAN MODE)
// OR b_search.value LIKE {$this->getPDO()->quote('%%' . $options['search'] . '%%', PDO::PARAM_STR)}
// OR MATCH (d_search.value) AGAINST ({$this->getPDO()->quote($options['search'], PDO::PARAM_STR)} IN BOOLEAN MODE)
// OR d_search.value LIKE {$this->getPDO()->quote('%%' . $options['search'] . '%%', PDO::PARAM_STR)}
// OR MATCH (f_search.value) AGAINST ({$this->getPDO()->quote($options['search'], PDO::PARAM_STR)} IN BOOLEAN MODE)
// OR f_search.value LIKE {$this->getPDO()->quote('%%' . $options['search'] . '%%', PDO::PARAM_STR)})";
$where[] = 'LEFT JOIN `'.$this->getNamespace().".database.properties` b_search ON a.uid IS NOT NULL AND b_search.documentUid = a.uid AND b_search.primitive = 'string'
LEFT JOIN
`".$this->getNamespace().'.database.relationships` c_search ON c_search.start = b_search.documentUid