Salome HOME
PR: corrections residuelles des anomalies du merge cvs
[modules/kernel.git] / src / RessourcesCatalog / SALOME_RessourcesCatalog_Server.cxx
index 827efd482290070a410eb27e229409b79de5bdf5..f8018d340dd3956f0caced2f7df376ae8e76487c 100644 (file)
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <iostream.h>
 #include "SALOME_NamingService.hxx"
 #include "SALOME_RessourcesCatalog_impl.hxx"
 #include "utilities.h"
-# include "Utils_SINGLETON.hxx"
+#include "LocalTraceCollector.hxx"
+#include "Utils_SINGLETON.hxx"
+using namespace std;
+
 int main(int argc,char **argv)
 {
-  try {
-  CosNaming::NamingContext_var _rootContext, catalogContext;
-
   // initialize the ORB
-
   CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
+  try
+    {
+      CosNaming::NamingContext_var _rootContext, catalogContext;
 
-  // initialize POA
-  //
-  long TIMESleep = 250000000;
-       int NumberOfTries = 40;
-       int a;
-       timespec ts_req;
-       ts_req.tv_nsec=TIMESleep;
-       ts_req.tv_sec=0;
-       timespec ts_rem;
-       ts_rem.tv_nsec=0;
-       ts_rem.tv_sec=0;
-       CosNaming::NamingContext_var inc;
-       PortableServer::POA_var poa;
-       CORBA::Object_var theObj;
-       CORBA::Object_var obj;
-       CORBA::Object_var object;
-       SALOME_Logger::Logger_var log;
-       SALOME_NamingService &naming = *SINGLETON_<SALOME_NamingService>::Instance() ;
-       int RESSOURCES_CATALOG=0;
-       const char * Env = getenv("USE_LOGGER");
-        int EnvL =0;
-       if ((Env!=NULL) && (strlen(Env)))
-         EnvL=1;
-       CosNaming::Name name;
-       name.length(1);
-       name[0].id=CORBA::string_dup("Logger");    
-       PortableServer::POAManager_var mgr; 
-       for (int i = 1; i<=NumberOfTries; i++){
+      // initialize POA
+      //
+      long TIMESleep = 250000000;
+      int NumberOfTries = 40;
+      int a;
+      timespec ts_req;
+      ts_req.tv_nsec=TIMESleep;
+      ts_req.tv_sec=0;
+      timespec ts_rem;
+      ts_rem.tv_nsec=0;
+      ts_rem.tv_sec=0;
+      CosNaming::NamingContext_var inc;
+      PortableServer::POA_var poa;
+      CORBA::Object_var theObj;
+      CORBA::Object_var obj;
+      CORBA::Object_var object;
+      SALOME_NamingService &naming = *SINGLETON_<SALOME_NamingService>::Instance() ;
+      int RESSOURCES_CATALOG=0;
+      const char * Env = getenv("USE_LOGGER");
+      int EnvL =0;
+      if ((Env!=NULL) && (strlen(Env)))
+       EnvL=1;
+      CosNaming::Name name;
+      name.length(1);
+      name[0].id=CORBA::string_dup("Logger");    
+      PortableServer::POAManager_var mgr; 
+      for (int i = 1; i<=NumberOfTries; i++)
+       {
          if (i!=1) 
            a=nanosleep(&ts_req,&ts_rem);
-         try{ 
-           obj = orb->resolve_initial_references("RootPOA");
-           if(!CORBA::is_nil(obj))
-             poa = PortableServer::POA::_narrow(obj);
-           if(!CORBA::is_nil(poa))
-             mgr = poa->the_POAManager();
-           if(!CORBA::is_nil(orb)) 
-         theObj = orb->resolve_initial_references("NameService");
-           if (!CORBA::is_nil(theObj))
-             inc = CosNaming::NamingContext::_narrow(theObj);
+         try
+           { 
+             obj = orb->resolve_initial_references("RootPOA");
+             if(!CORBA::is_nil(obj))
+               poa = PortableServer::POA::_narrow(obj);
+             if(!CORBA::is_nil(poa))
+               mgr = poa->the_POAManager();
+             if(!CORBA::is_nil(orb)) 
+               theObj = orb->resolve_initial_references("NameService");
+             if (!CORBA::is_nil(theObj))
+               inc = CosNaming::NamingContext::_narrow(theObj);
            }
          catch( CORBA::COMM_FAILURE& )
            {
-             MESSAGE( "Ressources Catalog: CORBA::COMM_FAILURE: Unable to contact the Naming Service" )
+             INFOS( "Ressources Catalog: CORBA::COMM_FAILURE: Unable to contact the Naming Service" );
+           }
+         if(!CORBA::is_nil(inc)) 
+           {
+             MESSAGE( "Ressources Catalog: Naming Service was found" );
+             if(EnvL==1)
+               {
+                 for(int j=1; j<=NumberOfTries; j++)
+                   {
+                     if (j!=1) 
+                       a=nanosleep(&ts_req, &ts_rem);
+                     try{
+                       object = inc->resolve(name);
+                     }
+                     catch(CosNaming::NamingContext::NotFound)
+                       { 
+                         INFOS( "Ressources Catalog: Logger Server wasn't found" );
+                       }
+                     catch(...)
+                       { 
+                         INFOS( "Ressources Catalog: Unknown exception" );
+                       }
+                     if (!CORBA::is_nil(object))
+                       {
+                         MESSAGE( "Ressources Catalog: Loger Server was found" );
+                         RESSOURCES_CATALOG=1;
+                         break;
+                       }
+                   }
                }
-         if(!CORBA::is_nil(inc)) {
-           MESSAGE( "Ressources Catalog: Naming Service was found" )
-             if(EnvL==1){
-               for(int j=1; j<=NumberOfTries; j++){
-                 if (j!=1) 
-                   a=nanosleep(&ts_req, &ts_rem);
-                 try{
-                   object = inc->resolve(name);
-                 }
-                 catch(CosNaming::NamingContext::NotFound){ MESSAGE( "Ressources Catalog: Logger Server wasn't found" ) }
-                 catch(...){ MESSAGE( "Ressources Catalog: Unknown exception" ) }
-                 if (!CORBA::is_nil(object))
-                   log = SALOME_Logger::Logger::_narrow(object);
-                 if (!CORBA::is_nil(log)){
-                   MESSAGE( "Ressources Catalog: Loger Server was found" )
-                     log->ping();
-                    RESSOURCES_CATALOG=1;
-                   break;
-                 }
-               }}
-         }
+           }
          if ((RESSOURCES_CATALOG==1)||((EnvL==0)&&(!CORBA::is_nil(inc))))
             break;
-             }
-  //
-  // Active catalog
+       }
+
+      // Active catalog
   
-  SALOME_RessourcesCatalogImpl* Catalogue_i = new SALOME_RessourcesCatalogImpl(argc, argv);
-  poa->activate_object (Catalogue_i);
-  mgr->activate();
-  CORBA::Object_ptr myCata = Catalogue_i->_this();
+      SALOME_RessourcesCatalogImpl* Catalogue_i = new SALOME_RessourcesCatalogImpl(argc, argv);
+      poa->activate_object (Catalogue_i);
+      mgr->activate();
+      CORBA::Object_ptr myCata = Catalogue_i->_this();
 
-  // initialise Naming Service
-  SALOME_NamingService *_NS;
-  _NS = new SALOME_NamingService(orb);
-  // register Catalog in Naming Service
-  _NS->Register(myCata ,"/Kernel/RessourcesCatalog");
+      // initialise Naming Service
+      SALOME_NamingService *_NS;
+      _NS = new SALOME_NamingService(orb);
+      // register Catalog in Naming Service
+      _NS->Register(myCata ,"/Kernel/RessourcesCatalog");
 
-  MESSAGE("Running Ressources Catalog Server.")
+      MESSAGE("Running Ressources Catalog Server.")
 
-  orb->run();
+       orb->run();
  
-  poa->destroy(1,1);
+      poa->destroy(1,1);
  
-  }
-    catch(CORBA::SystemException&) {
+    }
+  catch(CORBA::SystemException&) {
     INFOS("Caught CORBA::SystemException.")
-  }
-    catch(CORBA::Exception&) {
+      }
+  catch(CORBA::Exception&) {
     INFOS("Caught CORBA::Exception.")
-  }
+      }
 
+  delete myThreadTrace;
   return 0;
 }