mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tests (#6870)

Browse Source 
Injecting into the dev_cache without having hostname set caused the code to run an sql query.
Fix undefined index errors.
This commit is contained in:
Tony Murray
2017-06-20 16:56:38 -05:00
committed by GitHub
parent b8452862af
commit 2f4efb2a43
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/dbFacile.php
View File

@@ -94,7 +94,7 @@ function dbQuery($sql, $parameters = array())
$result = mysqli_query($database_link, $fullSql);
if (!$result) {
$mysql_error = mysqli_error($database_link);
if ((in_array($config['mysql_log_level'], array('INFO', 'ERROR')) && !preg_match('/Duplicate entry/', $mysql_error)) || (in_array($config['mysql_log_level'], array('DEBUG')))) {
if (isset($config['mysql_log_level']) && ((in_array($config['mysql_log_level'], array('INFO', 'ERROR')) && !preg_match('/Duplicate entry/', $mysql_error)) || in_array($config['mysql_log_level'], array('DEBUG')))) {
if (!empty($mysql_error)) {
logfile(date($config['dateformat']['compact']) . " MySQL Error: $mysql_error ($fullSql)");
}
@@ -344,7 +344,7 @@ function dbFetchRow($sql = null, $parameters = array(), $nocache = false)
{
global $config;
if ($config['memcached']['enable'] && $nocache === false) {
if (isset($config['memcached']['enable']) && $config['memcached']['enable'] && $nocache === false) {
$result = $config['memcached']['resource']->get(hash('sha512', $sql.'|'.serialize($parameters)));
if (!empty($result)) {
return $result;
@@ -359,7 +359,7 @@ function dbFetchRow($sql = null, $parameters = array(), $nocache = false)
recordDbStatistic('fetchrow', $time_start);
if ($config['memcached']['enable'] && $nocache === false) {
if (isset($config['memcached']['enable']) && $config['memcached']['enable'] && $nocache === false) {
$config['memcached']['resource']->set(hash('sha512', $sql.'|'.serialize($parameters)), $row, $config['memcached']['ttl']);
}
return $row;