Changeset 633

Timestamp:

03/13/07 23:57:18 (18 months ago)

Author:

hyriand

Message:

Made debugging domains configurable. By default museekd will be completely silent after loading the configuration.--This line, and those below, will be ignored--

M main.cpp

Files:

• branches/newnet/museekd/museekd/main.cpp (modified) (2 diffs)

branches/newnet/museekd/museekd/main.cpp

@@ -49 +49 @@
 };
 
+class KeySetCallback : public NewNet::Event<const Museek::ConfigManager::ChangeNotify *>::Callback
+{
+public:
+  virtual void operator()(const Museek::ConfigManager::ChangeNotify * notice)
+  {
+    if(notice->domain == "museekd.debug")
+    {
+      if(museekd->config()->getBool(notice->domain, notice->key))
+        NNLOG.enable(notice->key);
+      else
+        NNLOG.disable(notice->key);
+    }
+  }
+};
+
+class KeyRemovedCallback : public NewNet::Event<const Museek::ConfigManager::RemoveNotify *>::Callback
+{
+public:
+  virtual void operator()(const Museek::ConfigManager::RemoveNotify * notice)
+  {
+    if(notice->domain == "museekd.debug")
+      NNLOG.disable(notice->key);
+  }
+};
+
 int main(int argc, char ** argv)
 {
   /* Enable various interesting logging domains. */
-  NNLOG.enable("museek.warn");
-  NNLOG.enable("museek.note");
-  NNLOG.enable("museek.debug");
-//   NNLOG.enable("museek.direntry");
-  NNLOG.enable("museek.messages.iface");
-  NNLOG.enable("museek.messages.server");
-  NNLOG.enable("museek.messages.handshake");
-  NNLOG.enable("museek.messages.peer");
+  NNLOG.enable("ALL");
 
   /* Create our Museek Daemon instance. */
   museekd = new Museek::Museekd();
+
+  /* Connect our config watchers. */
+  museekd->config()->keySetEvent.connect(new KeySetCallback);
+  museekd->config()->keyRemovedEvent.connect(new KeyRemovedCallback);
 
   /* Load the configuration from ~/.museekd/newnet.xml. */
@@ -71 +93 @@
     return -1;
   }
-  
+
+  /* Disable the debug override. */
+  NNLOG.disable("ALL");
+
   museekd->LoadShares(); // works, yay ;)