Commit 2cd195a1 by guanghui.cui

单实例运行

parent 97499271
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
//推送类型 //推送类型
#define ODS_PUSH_TYPE_HEARTBEAT 3 //心跳 #define ODS_PUSH_TYPE_HEARTBEAT 3 //心跳
#define ODS_PUSH_TYPE_ORDER 1001 //订单
#define ODS_PUSH_TYPE_STOCKWARN 1006 //库存预警 #define ODS_PUSH_TYPE_STOCKWARN 1006 //库存预警
#define ODS_PUSH_TYPE_COMMON 1017 //通用预警 #define ODS_PUSH_TYPE_COMMON 1017 //通用预警
#define ODS_PUSH_TYPE_COMMON_BACK 1018 //通用预警返回 #define ODS_PUSH_TYPE_COMMON_BACK 1018 //通用预警返回
......
...@@ -728,7 +728,7 @@ bool JsonModule::convertDataOds2Pos(const std::string &data, std::string &result ...@@ -728,7 +728,7 @@ bool JsonModule::convertDataOds2Pos(const std::string &data, std::string &result
else if(pushType==ODS_PUSH_TYPE_COMMON){ else if(pushType==ODS_PUSH_TYPE_COMMON){
result = _convertToCommonWarnJson(data.c_str()); result = _convertToCommonWarnJson(data.c_str());
} }
else{ else if(pushType==ODS_PUSH_TYPE_ORDER){
orderObj order; orderObj order;
rlt = getPushOrders(data.c_str(),order); rlt = getPushOrders(data.c_str(),order);
......
...@@ -57,6 +57,7 @@ public: ...@@ -57,6 +57,7 @@ public:
void setSocketTimeout(int timeout); void setSocketTimeout(int timeout);
bool isValid(){ return m_bValid; } bool isValid(){ return m_bValid; }
bool setValid(bool valid){ m_bValid=valid; }
private: private:
bool m_bValid; bool m_bValid;
}; };
......
...@@ -52,7 +52,8 @@ void* listen_pos_func(void* arg) ...@@ -52,7 +52,8 @@ void* listen_pos_func(void* arg)
LOG(INFO) << "local listen port: [" << client_listen_port << "] successful"; LOG(INFO) << "local listen port: [" << client_listen_port << "] successful";
}else }else
{ {
LOG(INFO) << "local listen port: [" << client_listen_port << "] failed"; LOG(INFO) << "local listen port: [" << client_listen_port << "] failed, maybe instance is exist,exit!!!";
exit(1);
} }
while(true) while(true)
...@@ -330,6 +331,12 @@ int main() ...@@ -330,6 +331,12 @@ int main()
bool rlt = ods.send(responseData); bool rlt = ods.send(responseData);
LOG(INFO)<<"send result:"<<rlt; LOG(INFO)<<"send result:"<<rlt;
} }
else{
if(!bInitDone){
ods.setValid(false);
LOG(INFO)<<"maybe pos restart,reconnect!!!";
}
}
}else }else
{ {
......
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