Permalink
Browse files

remove more old code

  • Loading branch information...
1 parent 6dbea21 commit 887630ff2ef49a7c18e4da9c6a9649c269e04280 @grze grze committed Aug 13, 2009
Showing with 1 addition and 17 deletions.
  1. +1 −17 clc/modules/core/src/main/java/edu/ucsb/eucalyptus/StartupChecks.java
@@ -58,33 +58,17 @@ private static void fail( String... error ) {
public static boolean doChecks( ) {
StartupChecks.checkDirectories( );
- boolean wwwKs = false;
- try {
- wwwKs = EucaKeyStore.getInstance( ).check( );
- } catch ( GeneralSecurityException e ) {
- LOG.error( e, e );
- }
boolean hasDb = StartupChecks.checkDatabase( );
- if ( !wwwKs ) {
- try {
- StartupChecks.createKeyStores( );
- wwwKs = EucaKeyStore.getInstance( ).check( );
- } catch ( Exception e ) {
- LOG.error( e, e );
- StartupChecks.fail( "Error creating keystore instance." );
- }
- }
if ( !hasDb ) {
StartupChecks.createDb( );
hasDb = StartupChecks.checkDatabase( );
}
- if ( !hasDb || !wwwKs ) {
+ if ( !hasDb ) {
LOG.fatal( String.format( HEADER_FSTRING, "STARTUP FAILURE" ) );
if ( !hasDb ) LOG.fatal( "Failed to initialize the database in: " + SubDirectory.DB );
- if ( !wwwKs ) LOG.fatal( "Failed to read the www keystore: " + EucaKeyStore.getInstance( ).getFileName( ) );
StartupChecks.fail( "See errors messages above." );
}

0 comments on commit 887630f

Please sign in to comment.