From 8ac7f0ec5873c84c44d4cb2bc0a1d1247d6ae5ba Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 10:02:35 +0800
Subject: [PATCH] 增加日志，查找重启的问题
---
QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.cpp | 8 +++++++-
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 17 ++++++++++++++++-
QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.cpp | 4 ++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index 47c8eb5..a01ab7a 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -9,6 +9,7 @@
using std::string;
RtspAnalysManager::RtspAnalysManager(LDBTool *_dbTool) : m_lDBTool(nullptr), m_maxCount(50), m_currentCount(0) {
+ INFO("MYH DEBUG HERE");
m_lDBTool=new LDBTool;
init();
@@ -39,7 +40,7 @@
//鍒濆鍖栧嚱鏁�
void RtspAnalysManager::init() {
-
+ NFO("MYH DEBUG HERE")
auto lst = m_lDBTool->searchCamDevTableAll();
Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
@@ -50,6 +51,7 @@
for (auto item : lst)
{
+ INFO("MYH DEBUG HERE");
std::string t_camIdex = item.str_cam_dev_id.toStdString();
std::string rtsp_url = rtspAddrBuild(item.str_ip.toStdString(), 554, item.str_username.toStdString(),
item.str_password.toStdString(), item.str_brand.toStdString());
@@ -65,7 +67,9 @@
}
RtspAnalysManager::~RtspAnalysManager() {
+ INFO("Program Exit");
for (auto controller: m_controllers) {
+ INFO("Delete Controller: "<<controller.first);
delete controller.second;
}
m_controllers.clear();
@@ -84,6 +88,7 @@
Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
if (m_controllers.find(index) == m_controllers.end()) {
+ INFO("MYH DEBUG HERE");
if (m_currentCount >= m_maxCount) {
ERR("addCamera faild, camera's num is full!")
return -1;
@@ -111,6 +116,7 @@
* @return 鎬绘槸0
*/
int RtspAnalysManager::removeCamera(const std::string &index) {
+ INFO("MYH DEBUG HERE");
if (m_controllers.find(index) == m_controllers.end())return -1;
auto controller = m_controllers[index];
controller->stop();
@@ -124,6 +130,7 @@
imgRedis->wait();
delete imgRedis;
m_imgRedisControllers.erase(index);
+ INFO("MYH DEBUG HERE");
return 0;
}
@@ -132,6 +139,7 @@
* @return
*/
int RtspAnalysManager::removeAll() {
+ INFO("MYH DEBUG HERE");
for (auto controller: m_controllers) {
controller.second->stop();
}
@@ -140,6 +148,7 @@
delete controller.second;
}
m_controllers.clear();
+ INFO("MYH DEBUG HERE");
for (auto controller: m_imgRedisControllers) {
@@ -153,6 +162,7 @@
m_currentCount = 0;
+ INFO("MYH DEBUG HERE");
return 0;
}
@@ -191,11 +201,16 @@
//淇濆瓨瑙嗛鍒癛tspImageRedis鐨勯槦鍒�,鐢盧tspCaptureElement璋冪敤
bool RtspAnalysManager::SaveImageToRedis(const std::string& camId,const std::string& imageName,const cv::Mat& img)
{
+ INFO("MYH DEBUG HERE");
auto item = m_imgRedisControllers.find(camId);
if(item!=m_imgRedisControllers.end())
{
+ INFO("Save Succeed Cam: "<<camId<<" ImageKey: "<<imageName);
item->second->SaveImage(imageName,img);
+ } else {
+ ERROR("Save Failed Cam: "<<camId<<" ImageKey: "<<imageName);
}
+ INFO("MYH DEBUG HERE");
return true;
}
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.cpp
index 16aafb7..048999e 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.cpp
@@ -82,6 +82,7 @@
}
void RtspCaptureElement::SaveVideo(const std::string &strImageName)
{
+ INFO("SaveVideo: "<<strImageName);
std::string strTimeStamp= AppUtil::getTimeUSecString();
std::string strPath=MakeDir(strTimeStamp);
m_capture->SaveVideoByImageName(strPath,strImageName);
@@ -93,16 +94,19 @@
if(m_gpuIndex>=0){
setenv("CUDA_VISIBLE_DEVICES", std::to_string(m_gpuIndex).c_str(),0);
}
+ INFO("Open Video "<<m_path<<" GPU_Index: "<<m_gpuIndex);
m_capture->open(m_path.c_str(),m_gpuIndex>=0);
}
void RtspCaptureElement::threadInitial()
{
+ INFO("MYH DEBUG");
openVideo();
}
void RtspCaptureElement::threadClosing()
{
+ INFO("MYH DEBUG");
m_capture->close();
delete m_capture;
m_capture = nullptr;
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.cpp
index 4f74d16..d70de75 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.cpp
@@ -23,18 +23,20 @@
m_redisTool.setKeyImage(item.m_imgName,item.m_image);
m_redisTool.listLpush(m_camId, item.m_imgName);
m_imageQueue.pop();
+ INFO("SaveImage To Redis Succeed CamID:"<<m_camId<<" ImageName:"<<item.m_imgName);
}
}
//缁ф壙鑷埗绫�,绾跨▼鍒濆鍖栫殑涓�浜涘伐浣�
void RtspImageRedisElement::threadInitial()
{
-
+ INFO("MYH DEBUG HERE");
}
//缁ф壙鑷埗绫�,绾跨▼缁撴潫鐨勬椂鍊欒皟鐢�
void RtspImageRedisElement::threadClosing()
{
+ INFO("MYH DEBUG HERE");
}
//淇濆瓨鍥剧墖鍒伴槦鍒椾腑,
@@ -44,7 +46,11 @@
//淇濊瘉闃熷垪涓殑鍥剧墖涓嶈杩囧
if(m_imageQueue.size() < M_CAM_PIC_MAX_COUNT)
{
+ INFO("SaveImage Succeed ImgName:"<<imageName);
m_imageQueue.push(NameImagePair_s_t(imageName,img));
}
+ else{
+ ERR("SaveImage Failed ImgName:"<<imageName);
+ }
return true;
}
--
Gitblit v1.8.0