refined exceptions.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index b5496c7cb40a38ad4f2d0416eace362203235de6..3a76a555d1f2a0f08aad9932a087e385ae26c5e4 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -105,8 +105,9 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {

-         if(out) *out->log << "Opening dat-file: " << inFiles.back() << endl;
+         if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back() << endl << flush;

 
 

+         openFileName = inFiles.back();

          inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
          inFiles.pop_back();
 
          inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
          inFiles.pop_back();
 


@@ -121,8 +122,16 @@ bool configcache::readConfig()
        {
          int readturn = -1;
          try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
        {
          int readturn = -1;
          try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }

+         catch(boost::iostreams::bzip2_error& error) { 
+           if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
+           inFile.close();
+         } 

          catch (std::exception const& ex) {
          catch (std::exception const& ex) {

-           if(out) *out->log << "Caught exception: " << ex.what() << endl;
+           if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
+           inFile.close();
+         }
+         catch( ... ) {
+           if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;

            inFile.close();
          }
          
            inFile.close();
          }
          


@@ -131,7 +140,10 @@ bool configcache::readConfig()
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }

-         else inFile.close(); 
+         else {
+           *out->log << "CCACHE: Closing dat-file: " << openFileName << endl << flush;
+           inFile.close();
+         }

        }
     }
 }
        }
     }
 }