From 101a8d521c220b6dedcc5214566a8a6ee78156b6 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 9 May 2017 15:48:05 +0200 Subject: [PATCH] Fixed debug level being null when unset --- src/controller/controller.cpp | 2 +- src/controller/controller_api.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp index 0f638c0b..10075587 100644 --- a/src/controller/controller.cpp +++ b/src/controller/controller.cpp @@ -193,7 +193,7 @@ int main_loop(int argc, char ** argv){ if (Controller::conf.getOption("debug",true).size() > 1){ Controller::Storage["config"]["debug"] = Controller::conf.getInteger("debug"); } - if (Controller::Storage.isMember("config") && Controller::Storage["config"].isMember("debug")){ + if (Controller::Storage.isMember("config") && Controller::Storage["config"].isMember("debug") && Controller::Storage["config"]["debug"].isInt()){ Util::Config::printDebugLevel = Controller::Storage["config"]["debug"].asInt(); } //check for port, interface and username in arguments diff --git a/src/controller/controller_api.cpp b/src/controller/controller_api.cpp index 423fdd9d..b3e94277 100644 --- a/src/controller/controller_api.cpp +++ b/src/controller/controller_api.cpp @@ -196,8 +196,8 @@ void Controller::handleAPICommands(JSON::Value & Request, JSON::Value & Response JSON::Value & out = Controller::Storage["config"]; if (in.isMember("debug")){ out["debug"] = in["debug"]; - if (Util::Config::printDebugLevel != out["debug"].asInt()){ - Util::Config::printDebugLevel = out["debug"].asInt(); + if (Util::Config::printDebugLevel != (out["debug"].isInt()?out["debug"].asInt():DEBUG)){ + Util::Config::printDebugLevel = (out["debug"].isInt()?out["debug"].asInt():DEBUG); INFO_MSG("Debug level set to %u", Util::Config::printDebugLevel); } }