X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.ih;h=4b81e2eecce481234ce496ee985acdb9a2fd6dd6;hb=61dc3812717cdc89fa2402006d4009236b72dc8f;hp=bc48061c03dc514a2564f344669d26723dfe5bdd;hpb=4e05bff7db89ed83bfe3846c56273c7c91c6be59;p=senf.git

diff --git a/Utils/Logger/Target.ih b/Utils/Logger/Target.ih
index bc48061..4b81e2e 100644
--- a/Utils/Logger/Target.ih
+++ b/Utils/Logger/Target.ih
@@ -30,14 +30,33 @@
 #include <memory>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/shared_ptr.hpp>
 #include "../Console/LazyDirectory.hh"
+#include "../Console/Parse.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
 namespace senf {
+
+    namespace console { class DirectoryNode; }
+
 namespace log {
 namespace detail {
 
+    struct LogParameters {
+        StreamBase const * stream;
+        AreaBase const * area;
+        unsigned level;
+        void clear();
+        void setDefaults();
+        static LogParameters defaultParameters();
+    };
+
+    std::ostream & operator<<(std::ostream & os, LogParameters const & pm);
+
+    void senf_console_parse_argument(console::ParseCommandInfo::TokensRange const & tokens, 
+                                     LogParameters & out);
+
     /** \brief Internal: Target registry */
     class TargetRegistry
         : public senf::singleton<TargetRegistry>
@@ -60,16 +79,22 @@ namespace detail {
         void routed();
         bool fallbackRouting();
 
+        senf::console::ScopedDirectory<> & consoleDir();
+
+        void dynamicTarget(std::auto_ptr<Target> target);
+
     private:
         TargetRegistry();
+        ~TargetRegistry();
         
         void registerTarget(Target * target, std::string const & name);
         void unregisterTarget(Target * target);
 
         void consoleAreas(std::ostream & os);
         void consoleStreams(std::ostream & os);
-        void consoleWrite(std::string const & stream, std::string const & area, Level level,
-                          std::string const & msg);
+        void consoleWrite(LogParameters parameters, std::string const & msg);
+        void consoleRemoveTarget(Target * target);
+        boost::shared_ptr<senf::console::DirectoryNode> consoleSelf(std::ostream & os);
 
         typedef std::set<Target *> Targets;
         Targets targets_;
@@ -77,6 +102,8 @@ namespace detail {
         bool fallbackRouting_;
 
         console::LazyDirectory consoleDir_;
+
+        Targets dynamicTargets_;
         
         friend class senf::log::Target;
         friend class senf::singleton<TargetRegistry>;