defect 2975073: fix the issue that reventlog could not display the entries as cli expected.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8899 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2011-02-21 10:25:54 +00:00
parent fe08cc5f4c
commit 8730fef434

View File

@ -2841,6 +2841,7 @@ sub eventlog {
}
elsif($subcommand =~ /^\d+$/) {
$sessdata->{numevents} = $subcommand;
$sessdata->{displayedevents} = 0;
}
else {
return(1,"unsupported command eventlog $subcommand");
@ -3072,19 +3073,23 @@ sub got_sel {
if ($sessdata->{auxloginfo} and $sessdata->{auxloginfo}->{$entry}) {
$text.=" with additional data:";
if ($sessdata->{fullsel}) {
if ($sessdata->{fullsel} || ( $sessdata->{numevents}
&& $sessdata->{numevents} > $sessdata->{displayedevents})) {
xCAT::SvrUtils::sendmsg($text,$callback,$sessdata->{node},%allerrornodes);
foreach (split /\n/,$sessdata->{auxloginfo}->{$entry}) {
xCAT::SvrUtils::sendmsg($_,$sessdata->{node});
}
$sessdata->{displayedevents}++;
} else {
push(@{$sessdata->{selentries}},$text);
push @{$sessdata->{selentries}},split /\n/,$sessdata->{auxloginfo}->{$entry};
}
} else {
if ($sessdata->{fullsel}) {
if ($sessdata->{fullsel} || ($sessdata->{numevents}
&& $sessdata->{numevents} > $sessdata->{displayedevents})) {
xCAT::SvrUtils::sendmsg($text,$callback,$sessdata->{node},%allerrornodes);
$sessdata->{displayedevents}++;
} else {
push(@{$sessdata->{selentries}},$text);
}