revert the patch that checked spectre and canceled the commit if it could not talk to it
This commit is contained in:
parent
994da561a5
commit
70e50ca329
4 changed files with 1 additions and 50 deletions
|
|
@ -42,31 +42,6 @@ sub canView {
|
|||
return $user->isInGroup( $session->setting->get("groupIdAdminSpectre") );
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
=head2 getASpectre ( [$session] )
|
||||
|
||||
Get a connection to spectre. Encapsulated here so outside code can call
|
||||
something that's carefully encapsulated.
|
||||
|
||||
=head3 $session
|
||||
|
||||
A WebGUI session variable so getASpectre can access information in
|
||||
the config file.
|
||||
|
||||
=cut
|
||||
|
||||
sub getASpectre {
|
||||
my $session = shift;
|
||||
my $remote = create_ikc_client(
|
||||
port=>$session->config->get("spectrePort"),
|
||||
ip=>$session->config->get("spectreIp"),
|
||||
name=>rand(100000),
|
||||
timeout=>10
|
||||
);
|
||||
return $remote;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 www_spectreGetSiteData ( )
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ use WebGUI::International;
|
|||
use WebGUI::VersionTag;
|
||||
use WebGUI::HTMLForm;
|
||||
use WebGUI::Paginator;
|
||||
use WebGUI::Operation::Spectre;
|
||||
|
||||
=head1 NAME
|
||||
|
||||
|
|
@ -303,20 +302,7 @@ sub www_commitVersionTag {
|
|||
return www_manageVersions( $session );
|
||||
}
|
||||
|
||||
# Make sure we can connect to SPECTRE
|
||||
my $remote = WebGUI::Operation::Spectre::getASpectre($session);
|
||||
my $i18n = WebGUI::International->new($session, "VersionTag");
|
||||
if (!defined $remote) {
|
||||
$session->errorHandler->warn('Unable to connect to spectre. Canceling the commit');
|
||||
my $output = sprintf qq{<h1>%s</h1>\n<p>%s</p><p><a href="%s">%s</a>},
|
||||
$i18n->get('broken spectre title', 'WebGUI'),
|
||||
$i18n->get('broken spectre body', 'WebGUI'),
|
||||
$session->url->getBackToSiteURL(),
|
||||
$i18n->get('493', 'WebGUI');
|
||||
return $session->style->userStyle($output);
|
||||
}
|
||||
$remote->disconnect;
|
||||
|
||||
# Build the page
|
||||
my $output = '';
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue