Merge from branch CCRT_Port_V220.

[modules/kernel.git] / src / Session / SALOME_Session_Server.cxx

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 2a8522145276c90c9c6449359ab1951f638ffa23..a1106986d74ded6e6e48d8e4d768f2afd384fa64 100644 (file)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -55,11 +55,12 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include "utilities.h"
-#include "LocalTraceCollector.hxx"
+#include "SALOMETraceCollector.hxx"
 
 #include "SALOME_Session_i.hxx"
 
 #include "Session_ServerLauncher.hxx"
+using namespace std;
 
 extern "C" int HandleSignals(QApplication *theQApplication);
 
@@ -89,13 +90,29 @@ static int MYDEBUG = 0;
 static int MYDEBUG = 0;
 #endif
 
+void MessageOutput( QtMsgType type, const char *msg )
+{
+  switch ( type ) {
+  case QtDebugMsg:
+    MESSAGE( "Debug: " << msg );
+    break;
+  case QtWarningMsg:
+    MESSAGE( "Warning: " << msg );
+    break;
+  case QtFatalMsg:
+    MESSAGE( "Fatal: " << msg );
+    break;
+  }
+}
+
 int main(int argc, char **argv)
 {
   SALOME_Event::GetSessionThread();
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
   int orbArgc = 1;
   CORBA::ORB_var &orb = init( orbArgc , argv ) ;
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
+  SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
+  qInstallMsgHandler( MessageOutput );
   try
     {
       CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
@@ -197,7 +214,7 @@ int main(int argc, char **argv)
              }
            catch(std::exception& e)
              {
-               INFOS("run(): An exception has been caught");
+               INFOS("run(): An exception has been caught " <<e.what() );
                QApplication::restoreOverrideCursor();
                QAD_MessageBox::error1 ( (QWidget*)QAD_Application::getDesktop(),
                                        QObject::tr("ERR_ERROR"),