diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2010-03-31 09:48:00 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2010-03-31 09:48:00 +0000 |
| commit | 6a766667b59ab14dfe6d8d856c067058db526f8a (patch) | |
| tree | 8512c2ef9d267e6a1a3863b2c9e59113978a6f50 | |
| parent | fdadb1e563301b4b55917f677416226623ba51ec (diff) | |
| download | ATCD-6a766667b59ab14dfe6d8d856c067058db526f8a.tar.gz | |
Wed Mar 31 09:45:13 UTC 2010 Martin Corino <mcorino@remedy.nl>
* DAnCE/NodeManager/Node_Manager.cpp:
* DAnCE/NodeManager/NodeManager.mpc:
Added CIAO logger initialization to be able to see logging
from reused CIAO components (like Server activator).
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeManager/NodeManager.mpc | 3 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeManager/Node_Manager.cpp | 10 |
3 files changed, 19 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index bc8be3d1b04..5adf6637930 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 31 09:45:13 UTC 2010 Martin Corino <mcorino@remedy.nl> + + * DAnCE/NodeManager/Node_Manager.cpp: + * DAnCE/NodeManager/NodeManager.mpc: + Added CIAO logger initialization to be able to see logging + from reused CIAO components (like Server activator). + Wed Mar 31 09:38:13 UTC 2010 Martin Corino <mcorino@remedy.nl> * DAnCE/TargetManager/TargetManager.mpc: diff --git a/CIAO/DAnCE/NodeManager/NodeManager.mpc b/CIAO/DAnCE/NodeManager/NodeManager.mpc index 2a7d1529f9f..bfdacd62558 100644 --- a/CIAO/DAnCE/NodeManager/NodeManager.mpc +++ b/CIAO/DAnCE/NodeManager/NodeManager.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(Node_Manager_Exec) : utils, dance_exe, naming, avoids_ace_for_tao, dance_nodeapplicationmanager, dance_nodemanager_skel { +project(Node_Manager_Exec) : utils, dance_exe, naming, avoids_ace_for_tao, \ + dance_nodeapplicationmanager, dance_nodemanager_skel, ciao_logger { exename = dance_node_manager Source_Files { diff --git a/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/CIAO/DAnCE/NodeManager/Node_Manager.cpp index ef26925948a..76fffc8369a 100644 --- a/CIAO/DAnCE/NodeManager/Node_Manager.cpp +++ b/CIAO/DAnCE/NodeManager/Node_Manager.cpp @@ -5,6 +5,7 @@ #include "tao/Object.h" #include "DAnCE/Logger/Log_Macros.h" #include "DAnCE/Logger/Logger_Service.h" +#include "ciao/Logger/Logger_Service.h" #include "Node_Manager_Module.h" int @@ -24,6 +25,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) dlf->init (argc, argv); } + // Also initialize CIAO logger since we reuse parts of CIAO in the nodemanager + CIAO::Logger_Service + * clf = ACE_Dynamic_Service<CIAO::Logger_Service>::instance ("CIAO_Logger"); + + if (clf) + { + clf->init (argc, argv); + } + DANCE_DEBUG (6, (LM_TRACE, DLINFO ACE_TEXT("NodeManager - initializing ORB\n"))); |