mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-07-31 18:19:40 +00:00
Merge pull request #7641 from VersatusHPC/harvest/replaycons-consoleservice-detect
This commit is contained in:
@@ -71,9 +71,15 @@ if ($hmtab) {
|
||||
}
|
||||
my $file = "/var/log/consoles/$node";
|
||||
|
||||
#use confluent if it is there
|
||||
if ((-x "/opt/confluent/bin/confetty") || (-x "/usr/bin/confetty")) {
|
||||
$file = "/var/log/confluent/consoles/$node";
|
||||
#use confluent only when it is the configured console service, not merely
|
||||
#installed -- otherwise a host with confluent present but conserver active
|
||||
#would look in the wrong (empty) log directory
|
||||
my $stab = xCAT::Table->new('site');
|
||||
if ($stab) {
|
||||
(my $ref) = $stab->getAttribs({ key => 'consoleservice' }, 'value');
|
||||
if ($ref->{value} && $ref->{value} eq 'confluent') {
|
||||
$file = "/var/log/confluent/consoles/$node";
|
||||
}
|
||||
}
|
||||
|
||||
#print "file=$file\n";
|
||||
|
||||
Reference in New Issue
Block a user