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

optimize host creation, 2 sql queries nuked

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1935 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-19 19:34:40 +00:00
parent 9cef58a8b3
commit b653d6203e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/functions.php
View File

@ -296,7 +296,8 @@ function addHost($host, $community, $snmpver, $port = 161, $transport = 'udp')
{ {
if (mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `hostname` = '$host'"), 0) == '0' ) if (mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `hostname` = '$host'"), 0) == '0' )
{ {
# FIXME internalize # FIXME internalize -- but we don't have $device yet!
# FIXME this needs to be addhost.php's content instead, kindof, also use this function there then.
$snmphost = shell_exec($config['snmpget'] ." -m SNMPv2-MIB -Oqv -$snmpver -c $community $host:$port sysName.0"); $snmphost = shell_exec($config['snmpget'] ." -m SNMPv2-MIB -Oqv -$snmpver -c $community $host:$port sysName.0");
if ($snmphost == $host || $hostshort = $host) if ($snmphost == $host || $hostshort = $host)
{ {
@ -510,10 +511,7 @@ function createHost($host, $community, $snmpver, $port = 161, $transport = 'udp'
$sql = mysql_query("INSERT INTO `devices` (`hostname`, `sysName`, `community`, `port`, `transport`, `os`, `status`,`snmpver`) VALUES ('$host', '$host', '$community', '$port', '$transport', '$host_os', '1','$snmpver')"); $sql = mysql_query("INSERT INTO `devices` (`hostname`, `sysName`, `community`, `port`, `transport`, `os`, `status`,`snmpver`) VALUES ('$host', '$host', '$community', '$port', '$transport', '$host_os', '1','$snmpver')");
if (mysql_affected_rows()) if (mysql_affected_rows())
{ {
$device_id = mysql_result(mysql_query("SELECT device_id FROM devices WHERE hostname = '$host'"),0); return("Created host : $host (id:".mysql_insert_id().") (os:$host_os)");
# vv FIXME set_dev_attrib()
mysql_query("INSERT INTO devices_attribs (attrib_type, attrib_value, device_id) VALUES ('discover','1','$device_id')");
return("Created host : $host (id:$device_id) (os:$host_os)");
} }
else else
{ {