提交 da155b43 authored 作者: blu's avatar blu

big refacting of communitation architect

上级 45e71ecd
...@@ -51,18 +51,16 @@ private: ...@@ -51,18 +51,16 @@ private:
// //
void init() void init()
{ {
int ret; int ret = 0;
json jret; json jret;
bool inited = false; bool inited = false;
spdlog::info("evmgr boot {}", devSn);
spdlog::info("evmgr info: sn = {}, boot on {}", config["sn"].get<string>(), chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count());
devSn = config["sn"];
int opt_notify = ZMQ_NOTIFY_DISCONNECT|ZMQ_NOTIFY_CONNECT; int opt_notify = ZMQ_NOTIFY_DISCONNECT|ZMQ_NOTIFY_CONNECT;
string addr; string addr;
try { try {
// //
spdlog::info("evmgr {} starting with configuration:\n{}", devSn, config.dump(4)); spdlog::info("evmgr {} starting with configuration:{}", devSn, config.dump());
if(config["proto"] != "zmq") { if(config["proto"] != "zmq") {
spdlog::warn("evmgr {} unsupported protocol: {}, try fallback to zmq instead now...", devSn, config["proto"].get<string>()); spdlog::warn("evmgr {} unsupported protocol: {}, try fallback to zmq instead now...", devSn, config["proto"].get<string>());
...@@ -278,10 +276,10 @@ public: ...@@ -278,10 +276,10 @@ public:
EvMgr& operator=(EvMgr &&) = delete; EvMgr& operator=(EvMgr &&) = delete;
EvMgr() EvMgr()
{ {
string drport;
const char *strEnv = getenv("DR_PORT"); const char *strEnv = getenv("DR_PORT");
if(strEnv != NULL) { if(strEnv != NULL) {
config["dr-port"] = atoi(strEnv); drport = strEnv;
}else{ }else{
spdlog::error("evmgr failed to start. no DR_PORT set"); spdlog::error("evmgr failed to start. no DR_PORT set");
exit(1); exit(1);
...@@ -295,7 +293,7 @@ public: ...@@ -295,7 +293,7 @@ public:
spdlog::error("evmgr received invalid gid: {}", ident); spdlog::error("evmgr received invalid gid: {}", ident);
exit(1); exit(1);
} }
config["sn"] = v[0];
devSn = v[0]; devSn = v[0];
}else{ }else{
spdlog::error("evmgr failed to start. no SN set"); spdlog::error("evmgr failed to start. no SN set");
...@@ -303,8 +301,8 @@ public: ...@@ -303,8 +301,8 @@ public:
} }
// //
string addr = string("tcp://127.0.0.1:") + to_string(config["dr-port"]); string addr = string("tcp://127.0.0.1:") + drport;;
ident = config["sn"].get<string>() + ":evmgr:0"; ident = devSn + ":evmgr:0";
int ret = zmqhelper::setupDealer(&pCtxDealer, &pDealer, addr, ident); int ret = zmqhelper::setupDealer(&pCtxDealer, &pDealer, addr, ident);
if(ret != 0) { if(ret != 0) {
spdlog::error("evmgr {} failed to setup dealer {}", devSn, addr); spdlog::error("evmgr {} failed to setup dealer {}", devSn, addr);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论