Merge pull request #3800 from murrant/rrd-create-remote

RRD Cleanup: centralize rrd_exists check, utilize data_update() and rrd_name()
This commit is contained in:
Neil Lathwood
2016-08-10 18:44:45 +01:00
committed by GitHub
374 changed files with 2392 additions and 2960 deletions

View File

@@ -193,13 +193,11 @@ function getImageName($device, $use_database=true) {
function renamehost($id, $new, $source = 'console') {
global $config;
// FIXME does not check if destination exists!
$host = dbFetchCell("SELECT `hostname` FROM `devices` WHERE `device_id` = ?", array($id));
if (rename($config['rrd_dir']."/$host",$config['rrd_dir']."/$new") === TRUE) {
if (!is_dir($config['rrd_dir']."/$new") && rename($config['rrd_dir']."/$host", $config['rrd_dir']."/$new") === TRUE) {
dbUpdate(array('hostname' => $new), 'devices', 'device_id=?', array($id));
log_event("Hostname changed -> $new ($source)", $id, 'system');
}
else {
} else {
echo "Renaming of $host failed\n";
log_event("Renaming of $host failed", $id, 'system');
}