Changeset 548 for XIOS/branchs/xios-1.0/src/exception.cpp

Timestamp:

01/23/15 16:18:43 (9 years ago)

Author:

rlacroix

Message:

Backport r523 into the stable branch.

Improve the message error handling by mimicking the behavior of the info/report logs.

Output the error messages to the standart error message until the context is correctly initialized. Then, output the error messages to a file if the user has set "print_file" parameter to "true".

• Fix: Errors that occured before MPI was initialized (e.g. during the config file parsing) caused a MPI error on top of the original error.

• Fix: The error file could sometimes be misnamed if the error happened before the context was completely known.

File:

• XIOS/branchs/xios-1.0/src/exception.cpp (modified) (2 diffs)

XIOS/branchs/xios-1.0/src/exception.cpp

@@ -6 +6 @@
 #include "server.hpp"
 #include "cxios.hpp"
+#include "log.hpp"
 
 namespace xios
@@ -34 +35 @@
 #else
      {
-      int numDigit = 0;
-      int size = 0;
-      MPI_Comm_size(CXios::globalComm, &size);
-      while (size)
-      {
-        size /= 10;
-        ++numDigit;
-      }
-
-      StdOFStream fileStream;
-      StdStringStream fileNameErr;
-      std::streambuf* psbuf;
-      if (CXios::isServerSide)
-        fileNameErr << CXios::serverFile << "_" << std::setfill('0')
-                    << std::setw(numDigit) << CServer::getRank() << ".err";
-      else
-        fileNameErr << CXios::clientFile << "_" << std::setfill('0')
-                    << std::setw(numDigit) << CClient::getRank() << ".err";
-
-
-      fileStream.open(fileNameErr.str().c_str(), std::ofstream::out);
-      psbuf = fileStream.rdbuf();
-      std::cerr.rdbuf(psbuf);
-      std::cerr << this->getMessage() << std::endl;
-      fileStream.close();
+      error << this->getMessage() << std::endl;
       abort();
       }
-
 #endif
    }