pvl.dhcp.DHCPSyslogParser: separate error and error-type
authorTero Marttila <terom@paivola.fi>
Sun, 10 Feb 2013 19:56:39 +0200
changeset 213 711f71e7328b
parent 212 c2bbde4007aa
child 214 e314447c5621
pvl.dhcp.DHCPSyslogParser: separate error and error-type
pvl/dhcp/hosts.py
pvl/dhcp/syslog.py
--- a/pvl/dhcp/hosts.py	Sun Feb 10 19:12:56 2013 +0200
+++ b/pvl/dhcp/hosts.py	Sun Feb 10 19:56:39 2013 +0200
@@ -103,7 +103,7 @@
         if item.get('type') == 'DHCPNAK' :
             pass
         else :
-            attrs['error'] = item.get('error')
+            attrs['error'] = item.get('error-type') or item.get('error')
 
         # do not override name unless known
         if item.get('name') :
--- a/pvl/dhcp/syslog.py	Sun Feb 10 19:12:56 2013 +0200
+++ b/pvl/dhcp/syslog.py	Sun Feb 10 19:56:39 2013 +0200
@@ -207,7 +207,7 @@
             item = merge(item, dhcp_item)
 
             if item.get('error') :
-                item['error'] = self.parse_error(item['error'])
+                item['error-type'] = self.parse_error(item['error'])
             
             yield item