[svn] commit: r350 - in /branches/jelte-datadef/src: bin/parkinglot/ccsession.cc lib/bind-cfgd/python/bind-cfgd.py

[BIND 10 source code commits]

Author: jelte
Date: Fri Dec  4 10:38:45 2009
New Revision: 350

Log:
remove some debug verbosity

Modified:
    branches/jelte-datadef/src/bin/parkinglot/ccsession.cc
    branches/jelte-datadef/src/lib/bind-cfgd/python/bind-cfgd.py

Modified: branches/jelte-datadef/src/bin/parkinglot/ccsession.cc
==============================================================================
--- branches/jelte-datadef/src/bin/parkinglot/ccsession.cc (original)
+++ branches/jelte-datadef/src/bin/parkinglot/ccsession.cc Fri Dec  4 10:38:45 2009
@@ -61,8 +61,6 @@
 
     try {
         data_definition_ = DataDefinition(file, true);
-        cout << "Definition: " << endl;
-        cout << data_definition_.getDefinition() << endl;
     } catch (ParseError pe) {
         cout << "Error parsing definition file: " << pe.what() << endl;
         exit(1);
@@ -90,7 +88,6 @@
         ElementPtr cmd = Element::create_from_string("{ \"config_manager\": 1}");
         // why does the msgq seem to kill this msg?
         session_.group_sendmsg(data_definition_.getDefinition(), "ConfigManager");
-        cout << "def sent" << endl;
     } catch (...) {
         throw std::runtime_error("SessionManager: failed to open sessions");
     }
@@ -106,7 +103,6 @@
 CommandSession::getCommand(int counter) {
     ElementPtr cmd, routing, data, ep;
     string s;
-    cout << "[XX] PARKINGLOT GOT MESSAGE" << endl;
     session_.group_recvmsg(routing, data, false);
     string channel = routing->get("group")->string_value();
 
@@ -138,9 +134,7 @@
         if (cmd != NULL && cmd->get(1)->string_value() == "print_message") {
             cout << "[parkinglot] " << cmd->get(2)->string_value() << endl;
             ElementPtr answer = Element::create_from_string("{ \"result\": [0] }");
-            cout << "[XX] sending reply: " << answer << endl;
             session_.reply(routing, answer);
-            cout << "[XX] reply sent" << endl;
         }
     }
 
@@ -156,7 +150,6 @@
     session_.group_sendmsg(cmd, "ConfigManager");
     session_.group_recvmsg(env, result, false);
     BOOST_FOREACH(ElementPtr zone_name, result->get("result")->list_value()) {
-        cout << "[XX] add zone: " << zone_name->string_value() << endl;
         zone_names.push_back(zone_name->string_value());
     }
     return zone_names;

Modified: branches/jelte-datadef/src/lib/bind-cfgd/python/bind-cfgd.py
==============================================================================
--- branches/jelte-datadef/src/lib/bind-cfgd/python/bind-cfgd.py (original)
+++ branches/jelte-datadef/src/lib/bind-cfgd/python/bind-cfgd.py Fri Dec  4 10:38:45 2009
@@ -15,11 +15,7 @@
         del self.zones[zone_name]
 
     def set_data_definition(self, module_name, module_data_definition):
-        print ("[XX] set datadef for module " + module_name)
-        print ("[XX]")
-        print (self.zones)
         self.zones[module_name] = module_data_definition
-        print (self.data_definitions)
         self.data_definitions[module_name] = module_data_definition
 
 class ConfigManager:
@@ -117,15 +113,12 @@
                             conf_part = self.config.data
                         conf_part.update(cmd[2])
                         # send out changed info
-                        print("[XX][bind-cfgd] send update of part: " + cmd[1])
                         self.cc.group_sendmsg({ "config_update": conf_part }, cmd[1])
                         answer["result"] = [ 0 ]
                     elif len(cmd) == 2:
                         self.config.data.update(cmd[1])
                         # send out changed info
-                        print("[XX][bind-cfgd] send update of all")
                         for module in self.config.data:
-                            print("[XX][bind-cfgd] send update of part: " + module)
                             self.cc.group_sendmsg({ "config_update": self.config.data[module] }, module)
                         answer["result"] = [ 0 ]
                     else:
@@ -166,13 +159,8 @@
         while (self.running):
             msg, env = self.cc.group_recvmsg(False)
             if msg:
-                print("received message: ")
-                print(msg)
                 answer = self.handle_msg(msg);
-                print("sending answer: ")
-                print(answer)
                 self.cc.group_reply(env, answer)
-                print("answer sent")
             else:
                 self.running = False