Skip to content

Commit

Permalink
Fix parse of DHCP events in syslog
Browse files Browse the repository at this point in the history
  • Loading branch information
jacalvo committed Jun 13, 2018
1 parent 24e20eb commit f94ac3d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions main/dhcp/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
HEAD
+ Fix parse of DHCP events in syslog
+ Fix dhcp-parameter-request-list options concatenation
5.1
+ Supress annoying vendor-class-identifier warnings in zentyal.log
Expand Down
2 changes: 1 addition & 1 deletion main/dhcp/src/EBox/DHCPLogHelper.pm
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ sub processLine # (file, line, logger)
{
my ($self, $file, $line, $dbengine) = @_;

return unless ($line =~ /^(\w+\s+\d+ \d\d:\d\d:\d\d) \S+ dhcpd:.*/);
return unless ($line =~ /^(\w+\s+\d+ \d\d:\d\d:\d\d) \S+ dhcpd\[\d+\]:.*/);

my $date = $1 . ' ' . (${[localtime(time)]}[5] + 1900);
my ($ip, $mac, $iface, $event);
Expand Down

0 comments on commit f94ac3d

Please sign in to comment.