nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #592 from f0o/issue-588

Browse Source 
Future-Proof db-cleanup on device deletion
This commit is contained in:
Neil Lathwood
2015-03-12 16:58:23 +00:00
parent 0324f51028 33e8d05c1d
commit 69c87e4507
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/delhost.inc.php
+1 -1
View File
@@ -23,7 +23,7 @@ if (is_numeric($_REQUEST['id']))
');
if ($_REQUEST['confirm'])
{
print_message(delete_device(mres($_REQUEST['id']))."\n");
print_message(nl2br(delete_device(mres($_REQUEST['id'])))."\n");
}
else
{
includes/functions.php
+11 -10
View File
@@ -236,7 +236,7 @@ function renamehost($id, $new, $source = 'console')
function delete_device($id)
{
global $config;
global $config, $debug;
$ret = '';
$host = dbFetchCell("SELECT hostname FROM devices WHERE device_id = ?", array($id));
@@ -249,19 +249,20 @@ function delete_device($id)
$ret .= "Removed interface $int_id ($int_if)\n";
}
dbDelete('devices', "`device_id` = ?", array($id));
$device_tables = array('entPhysical', 'devices_attribs', 'devices_perms', 'bgpPeers', 'vlans', 'vrfs', 'storage', 'alerts', 'eventlog',
'syslog', 'ports', 'services', 'toner', 'frequency', 'current', 'sensors','ciscoASA');
foreach ($device_tables as $table)
{
dbDelete($table, "`device_id` = ?", array($id));
$fields = array('device_id','host');
foreach( $fields as $field ) {
foreach( dbFetch("SELECT table_name FROM information_schema.columns WHERE table_schema = ? AND column_name = ?",array($config['db_name'],$field)) as $table ) {
$table = $table['table_name'];
$entries = (int) dbDelete($table, "`$field` = ?", array($id));
if( $entries > 0 && $debug === true ) {
$ret .= "$field@$table = #$entries\n";
}
}
}
shell_exec("rm -rf ".trim($config['rrd_dir'])."/$host");
$ret = "Removed device $host";
$ret .= "Removed device $host\n";
return $ret;
}