X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FtestServer.cc;h=3ed6ba98144c9a637662e4f8290b7fce02554c31;hb=489be2bbd4d03259a17df14e4962a4524cd5b654;hp=a1c3c2b350cbebcc574eddeecbcbf90b90002c92;hpb=6e417a227d417cef20d55af94e2474fbe9c280b8;p=senf.git

diff --git a/Console/testServer.cc b/Console/testServer.cc
index a1c3c2b..3ed6ba9 100644
--- a/Console/testServer.cc
+++ b/Console/testServer.cc
@@ -69,34 +69,51 @@ void shutdownServer()
     throw senf::console::Executor::ExitException();
 }
 
+void enableLogging(std::ostream & os)
+{
+    senf::console::Client::get(os).route<senf::log::NOTICE>();
+}
+
 int main(int, char **)
 {
     ::signal(SIGPIPE, SIG_IGN);
-    senf::log::ConsoleTarget::instance().route< senf::SenfLog, senf::log::NOTICE >();
+    senf::log::ConsoleTarget::instance().route< senf::log::VERBOSE >();
 
     senf::console::root()
         .doc("This is the console test application");
+
     senf::console::root()
-        .mkdir("network")
-        .doc("Network related settings");
-    senf::console::root()["network"]
-        .mkdir("eth0")
-        .doc("Ethernet device eth0");
+        .mkdir("console")
+        .doc("Console settings");
+
+    senf::console::DirectoryNode & serverDir (
+        senf::console::root()
+            .mkdir("server")
+            .doc("server commands") );
+
+    senf::console::ScopedDirectory<> testDir;
     senf::console::root()
-        .mkdir("server");
-    senf::console::root()["server"]
+        .add("test", testDir)
+        .doc("Test functions");
+
+    senf::console::root()["console"]
+        .add("showlog", &enableLogging)
+        .doc("Enable display of log messages on the current console");
+
+    serverDir
         .add("shutdown", &shutdownServer)
         .doc("Terminate server application");
-    senf::console::root()["network"]
+
+    testDir
         .add("echo", &echo)
         .doc("Example of a function utilizing manual argument parsing");
 
     TestObject test;
-    senf::console::root()
-        .add("testob", test.dir)
+    testDir
+        .add("extra", test.dir)
         .doc("Example of an instance directory");
 
-    senf::console::Server::start( senf::INet4SocketAddress(23232) )
+    senf::console::Server::start( senf::INet4SocketAddress(23232u) )
         .name("testServer");
 
     senf::Scheduler::instance().process();