135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential Postgres insert failure (#306)

Browse Source 
Some devices can contain random non-utf8 data in syscontact and syslocation,
making the insert fail with "ERROR:  invalid byte sequence for encoding "UTF8"
on discovery. Work around this with Encode::decode.
This commit is contained in:
Christian Ramseyer
2017-04-21 21:20:36 +02:00
committed by Oliver Gorwits
parent 96a3313fb7
commit 0737914af5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/App/Netdisco/Core/Discover.pm
View File

@@ -144,7 +144,7 @@ sub store_device {
my @properties = qw/ my @properties = qw/
snmp_ver snmp_ver
description uptime contact name location description uptime name
layers ports mac layers ports mac
ps1_type ps2_type ps1_status ps2_status ps1_type ps2_type ps1_status ps2_status
fan slots fan slots
@@ -157,6 +157,9 @@ sub store_device {
$device->set_column( model => Encode::decode('UTF-8', $snmp->model) ); $device->set_column( model => Encode::decode('UTF-8', $snmp->model) );
$device->set_column( serial => Encode::decode('UTF-8', $snmp->serial) ); $device->set_column( serial => Encode::decode('UTF-8', $snmp->serial) );
$device->set_column( contact => Encode::decode('UTF-8', $snmp->contact) );
$device->set_column( location => Encode::decode('UTF-8', $snmp->location) );
$device->set_column( snmp_class => $snmp->class ); $device->set_column( snmp_class => $snmp->class );
$device->set_column( last_discover => \'now()' ); $device->set_column( last_discover => \'now()' );