Commit 2c82b210 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

remove some debug verbosity


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/jelte-datadef@350 e5f2f494-b856-4b98-b285-d166d9295462
parent 00495db0
......@@ -61,8 +61,6 @@ CommandSession::read_data_definition(const std::string& filename) {
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 @@ CommandSession::CommandSession() :
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 @@ std::pair<std::string, ElementPtr>
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 @@ CommandSession::getCommand(int counter) {
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 @@ CommandSession::getZones() {
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;
......
......@@ -15,11 +15,7 @@ class ConfigData:
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 @@ class ConfigManager:
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 @@ class ConfigManager:
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment