Initial merge for ICE-2400:

- added new Logger admin facet (C++ only)
- this Logger facet allows remote application to retrieve the Ice log file, including recently logged events, with optional filters
- this logger facet also allows remote applications to attach RemoteLogger objects to get new logs as they are generated
- added new "show log" feature to icegridadmin, to retrieve Ice log file of Ice server (not yet implemented for IceGrid registry and node)

1 files changed, 6 insertions, 2 deletions

diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index af22bd5aade..bfd08d10438 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -120,8 +120,8 @@ public:
     void describeObject(const std::list<std::string>&);
     void listObject(const std::list<std::string>&);
 
-    void showFile(const std::string&, const std::list<std::string>&);
-
+    void show(const std::string&, const std::list<std::string>&);
+    
     void showBanner();
     void showCopying();
     void showWarranty();
@@ -151,6 +151,10 @@ private:
     Parser(const Ice::CommunicatorPtr&, const AdminSessionPrx&, const AdminPrx&, bool);
     void exception(const Ice::Exception&);
 
+    void showFile(const std::string&, const std::string&, const std::string&, bool, bool, bool, int);
+    void showLog(const std::string&, const std::string&, bool, bool, int);
+    
+
     std::string _commands;
     Ice::CommunicatorPtr _communicator;
     AdminSessionPrx _session;