xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-28 15:21:11 +00:00
Code Issues Releases Wiki Activity

Print a more user friendly message when running makeconfluentcfg

Browse Source 
if the confluent daemon is not running.  Bug #4705
This commit is contained in:
Victor Hu
2015-06-18 15:35:43 -04:00
parent 9cf2093e22
commit 63f547a168
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/Confluent/Client.pm
View File

@@ -87,7 +87,7 @@ sub ssl_connect {
}
$self->{handle} = IO::Socket::SSL->new(%sslargs);
unless ($self->{handle}) {
die "Unable to reach target, $SSL_ERROR/$!";
return undef;
}
}
@@ -107,7 +107,7 @@ sub new {
$self->{handle} = $self->ssl_connect($serverlocation, @_);
}
unless ($self->{handle}) {
die "General failure connecting $!";
return undef;
}
$self->{server} = Confluent::TLV->new($self->{handle});
my $banner = $self->{server}->recv();

7
xCAT-server/lib/xcat/plugins/confluent.pm
View File

@@ -201,6 +201,13 @@ sub makeconfluentcfg {
my $svboot=0;
if (exists($req->{svboot})) { $svboot=1;}
my $confluent = Confluent::Client->new(); # just the local form for now..
unless ($confluent) {
# unable to get a connection to confluent
my $rsp;
$rsp->{data}->[0] = "Unable to open a connection to confluent, verify that confluent is running.";
xCAT::MsgUtils->message("E", $rsp, $cb);
return;
}
my $isSN=xCAT::Utils->isServiceNode();
my @hostinfo=xCAT::NetworkUtils->determinehostname();