Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5294 less installer rough edges #5295

Merged
merged 4 commits into from
Nov 9, 2018
Merged

5294 less installer rough edges #5295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
781b100
more robust glassfish restart
pameyer Nov 8, 2018
df0c4be
only try to sudo to glassfish user if installer isn't running as glas…
pameyer Nov 8, 2018
7911284
typo fix
pameyer Nov 9, 2018
d9cc38c
another typo fix
pameyer Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion scripts/installer/glassfish-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,9 @@ fi
###
# Restart
echo Updates done. Restarting...
./asadmin $ASADMIN_OPTS restart-domain $GLASSFISH_DOMAIN
# encountered cases where `restart-domain` timed out, but `stop` -> `start` didn't.
./asadmin $ASADMIN_OPTS stop-domain $GLASSFISH_DOMAIN
./asadmin $ASADMIN_OPTS start-domain $GLASSFISH_DOMAIN

###
# Clean up
Expand Down
9 changes: 7 additions & 2 deletions scripts/installer/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,8 +961,13 @@ sub setup_glassfish {
print STDERR $DOMAIN_DOWN . "\n";
if ($DOMAIN_DOWN) {
print "Trying to start domain up...\n";
system( "sudo -u $CONFIG_DEFAULTS{'GLASSFISH_USER'} " . $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/bin/asadmin start-domain domain1" );

if ( $current_user eq $CONFIG_DEFAULTS{'GLASSFISH_USER'} ){
system( $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/bin/asadmin start-domain domain1" );
}
else
{
system( "sudo -u $CONFIG_DEFAULTS{'GLASSFISH_USER'} " . $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/bin/asadmin start-domain domain1" );
}
# TODO: (?) - retest that the domain is running now?
}
else
Expand Down