Browse Source

打开一人多卡功能,采集启动web服务连不上的情况依然能启动

lixioayao 6 years ago
parent
commit
6943bff9a8
2 changed files with 6 additions and 5 deletions
  1. 3 3
      card_base.cpp
  2. 3 2
      main.cpp

+ 3 - 3
card_base.cpp

@@ -86,9 +86,9 @@ void card_location_base::on_location(const std::vector<point>&vp,const std::vect
 		x = tool_other::round(pt.x,3);
 		y = tool_other::round(pt.y,3);
 
-		//Msg m;
-		//m.type=m_type;m.x=(int)x;m.y=(int)y;m.cmd=CMD_HANDLE;m.cardid=m_type<<32|m_id;
-		//cardMgr::instance()->tryPut(m);
+		Msg m;
+		m.type=m_type;m.x=(int)x;m.y=(int)y;m.cmd=CMD_HANDLE;m.cardid=m_type<<32|m_id;
+		cardMgr::instance()->tryPut(m);
 
 		double acc = lm[0].m_acc;
         m_acc = lm[0].m_acc;

+ 3 - 2
main.cpp

@@ -56,8 +56,10 @@ struct Init_Setting
         if(!_mysql_init(DBSetting))
         {
             std_info("连接DB[%s:%s] 失败,采集服务器无法启动!",DBSetting.Host.c_str(),DBSetting.User.c_str());
+            log_warn("连接DB[%s:%s] 失败,采集服务器无法启动!",DBSetting.Host.c_str(),DBSetting.User.c_str());
             exit(0);
         }
+        log_info("数据库线程池创建成功");
 
         std::string url=config.get("service.websocket_url","ws://127.0.0.1:8086");
         int32_t send_interval =config.get("service.interval_send_json_postion",1);
@@ -67,7 +69,7 @@ struct Init_Setting
         if(!wsClientMgr_init(url_list,send_interval))
         {
             std_info("连接webServer[%s] 失败,采集服务器无法启动!",url.c_str());
-            exit(0);
+            log_warn("连接webServer[%s] 失败!",url.c_str());
         }
 		CYaSetting::Init_sys_setting();
         sit_list::instance()->load_from_db();
@@ -123,7 +125,6 @@ struct Init_Setting
             std_error("数据库线程池创建失败,Err=%s", szError.c_str());
 			flag = false;
         }
-        std_info("数据库线程池创建成功");
 		return flag;
     }