提交 6c758983 authored 作者: blu's avatar blu

upload video files

上级 3ab328a1
...@@ -275,6 +275,7 @@ private: ...@@ -275,6 +275,7 @@ private:
ret.clear(); ret.clear();
ret["code"] = -1; ret["code"] = -1;
ret["msg"] = string("evcloudsvc exception: ") + e.what(); ret["msg"] = string("evcloudsvc exception: ") + e.what();
splog::error("evcloudsvc exception: {}", e.what());
} }
...@@ -550,9 +551,14 @@ public: ...@@ -550,9 +551,14 @@ public:
spdlog::error("evcloudsvc failed to get confg for {}: {}", _sn, ret["msg"].get<string>()); spdlog::error("evcloudsvc failed to get confg for {}: {}", _sn, ret["msg"].get<string>());
} }
else { else {
ret["data"] = ret["data"].patch(cfg); if(ret.count("data") == 0 || ret["data"].size() == 0) {
spdlog::info("evcloudsvc merged {}: {} \n\t{}", _sn, cfg.dump(), ret["data"].dump()); spdlog::error("evcloudsvc no existing valid configuration for {}. abort patching", sn);
ret = this->config(ret); }else{
ret["data"] = ret["data"].patch(cfg);
spdlog::info("evcloudsvc merged {}: {} \n\t{}", _sn, cfg.dump(), ret["data"].dump());
ret = this->config(ret);
}
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论