modify timeout
This commit is contained in:
@@ -3561,7 +3561,7 @@ std::string get_type_by_state(int state) {
|
|||||||
return "补招事件日志";
|
return "补招事件日志";
|
||||||
|
|
||||||
case static_cast<int>(DeviceState::READING_STATSFILE):
|
case static_cast<int>(DeviceState::READING_STATSFILE):
|
||||||
return "补招稳态数据文件";
|
return "补招文件";
|
||||||
|
|
||||||
case static_cast<int>(DeviceState::CUSTOM_ACTION):
|
case static_cast<int>(DeviceState::CUSTOM_ACTION):
|
||||||
return "自定义动作";
|
return "自定义动作";
|
||||||
@@ -3585,7 +3585,7 @@ void check_device_busy_timeout()
|
|||||||
|
|
||||||
if (dev.busytype == static_cast<int>(DeviceState::READING_FILEDATA) || dev.busytype == static_cast<int>(DeviceState::READING_STATSFILE)) //下载文件业务
|
if (dev.busytype == static_cast<int>(DeviceState::READING_FILEDATA) || dev.busytype == static_cast<int>(DeviceState::READING_STATSFILE)) //下载文件业务
|
||||||
{
|
{
|
||||||
if (dev.busytimecount > 60)
|
if (dev.busytimecount > 600)
|
||||||
{
|
{
|
||||||
std::cout << "[Timeout] Device " << dev.terminal_id
|
std::cout << "[Timeout] Device " << dev.terminal_id
|
||||||
<< " busytype=READING_FILEDATA 超时("
|
<< " busytype=READING_FILEDATA 超时("
|
||||||
@@ -3607,7 +3607,7 @@ void check_device_busy_timeout()
|
|||||||
//发送超时响应
|
//发送超时响应
|
||||||
//send_reply_to_cloud(static_cast<int>(ResponseCode::TIMEOUT),dev.terminal_id,get_type_by_state(dev.busytype),dev.guid,dev.mac);
|
//send_reply_to_cloud(static_cast<int>(ResponseCode::TIMEOUT),dev.terminal_id,get_type_by_state(dev.busytype),dev.guid,dev.mac);
|
||||||
send_reply_to_queue(dev.guid, static_cast<int>(ResponseCode::TIMEOUT),
|
send_reply_to_queue(dev.guid, static_cast<int>(ResponseCode::TIMEOUT),
|
||||||
"终端 id: " + dev.terminal_id + "进行业务:" + get_type_by_state(dev.busytype) +"超时,停止该业务处理");
|
"终端 id: " + dev.terminal_id + "进行业务:" + get_type_by_state(dev.busytype) +"超时600秒,停止该业务处理");
|
||||||
|
|
||||||
// 超时清空状态
|
// 超时清空状态
|
||||||
//若还有未处理条目,则仅复位计时,不清设备状态,交给 check_recall_event() 弹掉 FAILED 并继续下一条
|
//若还有未处理条目,则仅复位计时,不清设备状态,交给 check_recall_event() 弹掉 FAILED 并继续下一条
|
||||||
@@ -3633,7 +3633,7 @@ void check_device_busy_timeout()
|
|||||||
}
|
}
|
||||||
else //其他业务,包括补招日志都是20s一条,一问一答的时间
|
else //其他业务,包括补招日志都是20s一条,一问一答的时间
|
||||||
{
|
{
|
||||||
if (dev.busytimecount > 20)
|
if (dev.busytimecount > 30)
|
||||||
{
|
{
|
||||||
std::cout << "[Timeout] Device " << dev.terminal_id
|
std::cout << "[Timeout] Device " << dev.terminal_id
|
||||||
<< " busytype=" << dev.busytype
|
<< " busytype=" << dev.busytype
|
||||||
@@ -3655,7 +3655,7 @@ void check_device_busy_timeout()
|
|||||||
//发送超时响应
|
//发送超时响应
|
||||||
//send_reply_to_cloud(static_cast<int>(ResponseCode::TIMEOUT),dev.terminal_id,get_type_by_state(dev.busytype),dev.guid,dev.mac);
|
//send_reply_to_cloud(static_cast<int>(ResponseCode::TIMEOUT),dev.terminal_id,get_type_by_state(dev.busytype),dev.guid,dev.mac);
|
||||||
send_reply_to_queue(dev.guid, static_cast<int>(ResponseCode::TIMEOUT),
|
send_reply_to_queue(dev.guid, static_cast<int>(ResponseCode::TIMEOUT),
|
||||||
"终端 id: " + dev.terminal_id + "进行业务:" + get_type_by_state(dev.busytype) +"超时,停止该业务处理");
|
"终端 id: " + dev.terminal_id + "进行业务:" + get_type_by_state(dev.busytype) +"超时30秒,停止该业务处理");
|
||||||
|
|
||||||
// 超时清空状态
|
// 超时清空状态
|
||||||
//若还有未处理条目,则仅复位计时,不清设备状态,交给 check_recall_event() 弹掉 FAILED 并继续下一条
|
//若还有未处理条目,则仅复位计时,不清设备状态,交给 check_recall_event() 弹掉 FAILED 并继续下一条
|
||||||
|
|||||||
Reference in New Issue
Block a user