xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1726 from hu-weihua/probebug

Browse Source 
Fix probe bug #1717 log parse error when the lable of log looks like "dhcp[process id]"
This commit is contained in:
zet809 2016-08-18 10:50:20 +08:00 committed by GitHub
commit 7c067c11fe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-probe/subcmds/osdeploy
View File

@ -763,7 +763,7 @@ Start capturing every message during OS provision process......
if ($hdl == \*VARLOGMSGFILE) {
chomp($line = <VARLOGMSGFILE>);
my @tmp = split(/\s+/, $line);
if ($tmp[4] =~ /dhcpd:/i && $line =~ /$installnic/) {
if ($tmp[4] =~ /dhcpd/i && $line =~ /$installnic/) {
handle_dhcp_msg("$line");
} elsif ($tmp[4] =~ /in.tftpd/i) {
handle_tftp_msg("$line");
@ -848,7 +848,7 @@ sub get_valid_logs {
}
my $ishttplog = 0;
$ishttplog = 1 if ($filename =~ /access[\._]log/);
$ishttplog = 1 if ($filename =~ /access/);
foreach my $file (@rotatefiles) {
my $fd;
@ -929,7 +929,7 @@ sub get_valid_logs {
$timestampepoch = probe_utils->convert_to_epoch_seconds($timestamp, $year, $epoch_seconds_of_now);
}
if (($splitline[4] =~ /dhcpd:/i && $_ =~ /$installnic/)
if (($splitline[4] =~ /dhcpd/i && $_ =~ /$installnic/)
|| ($splitline[4] =~ /in.tftpd/i)
|| (($splitline[4] =~ /^xcat/i) || ($splitline[5] =~ /^xcat/i))
|| ($splitline[5] =~ /GET/ && $splitline[7] =~ /HTTP/)) {
@ -968,7 +968,7 @@ sub do_replay {
foreach my $line (@bthistory) {
$line =~ s/(\d+) (.+)/$2/g;
my @tmp = split(/\s+/, $line);
if ($tmp[4] =~ /dhcpd:/i && $line =~ /$installnic/) {
if ($tmp[4] =~ /dhcpd/i && $line =~ /$installnic/) {
handle_dhcp_msg("$line");
} elsif ($tmp[4] =~ /in.tftpd/i) {
handle_tftp_msg("$line");