Commit bdcfe887181b6643553a16bf869d52b29ea1390f

Authored by Eli de Faria Junior
1 parent f0cbb68e
Exists in master

refactoring logs

cacic-daemon/cacicD/Readme.txt
@@ -11,4 +11,4 @@ Para instalar um serviço no Linux (TESTADO no Ubuntu 14.04): @@ -11,4 +11,4 @@ Para instalar um serviço no Linux (TESTADO no Ubuntu 14.04):
11 2- criar um link simbolico para /etc/rc2.d/S99cacic 11 2- criar um link simbolico para /etc/rc2.d/S99cacic
12 * sudo ln -s /etc/init.d/cacic /etc/rc2.d/S99cacic 12 * sudo ln -s /etc/init.d/cacic /etc/rc2.d/S99cacic
13 3- iniciar o serviço. 13 3- iniciar o serviço.
14 - * /bin/bash -vx /etc/init.d/cacic start 14 + * sudo /etc/init.d/cacic start
cacic-daemon/cacicD/cacicd.cpp
@@ -10,8 +10,8 @@ cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv, @@ -10,8 +10,8 @@ cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv,
10 setServiceFlags(QtService::Default); 10 setServiceFlags(QtService::Default);
11 11
12 logManager = QLogger::QLoggerManager::getInstance(); 12 logManager = QLogger::QLoggerManager::getInstance();
13 - logManager->addDestination(application()->applicationDirPath() + "/cacicLog.txt","Cacic Daemon",QLogger::InfoLevel);  
14 - logManager->addDestination(application()->applicationDirPath() + "/cacicLog.txt","Cacic Daemon",QLogger::ErrorLevel); 13 + logManager->addDestination(application()->applicationDirPath() + "/Logs/cacicLog.txt","Cacic Daemon",QLogger::InfoLevel);
  14 + logManager->addDestination(application()->applicationDirPath() + "/Logs/cacicLog.txt","Cacic Daemon",QLogger::ErrorLevel);
15 } catch (...){ 15 } catch (...){
16 qCritical() << "Error desconhecido no construtor."; 16 qCritical() << "Error desconhecido no construtor.";
17 QLogger::QLog_Error("Cacic Daemon", QString("Erro desconhecido no construtor.")); 17 QLogger::QLog_Error("Cacic Daemon", QString("Erro desconhecido no construtor."));
cacic-daemon/cacicD/cacicthread.cpp
@@ -51,6 +51,6 @@ void CacicThread::registraFimColeta(QString msg) @@ -51,6 +51,6 @@ void CacicThread::registraFimColeta(QString msg)
51 51
52 void CacicThread::iniciarInstancias(){ 52 void CacicThread::iniciarInstancias(){
53 logManager = QLogger::QLoggerManager::getInstance(); 53 logManager = QLogger::QLoggerManager::getInstance();
54 - logManager->addDestination(this->applicationDirPath + "/cacicLog.txt","Cacic Daemon (Thread)",QLogger::InfoLevel);  
55 - logManager->addDestination(this->applicationDirPath + "/cacicLog.txt","Cacic Daemon (Thread)",QLogger::ErrorLevel); 54 + logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Cacic Daemon (Thread)",QLogger::InfoLevel);
  55 + logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Cacic Daemon (Thread)",QLogger::ErrorLevel);
56 } 56 }
cacic-daemon/cacicD/cacictimer.cpp
@@ -34,6 +34,10 @@ void CacicTimer::mslot(){ @@ -34,6 +34,10 @@ void CacicTimer::mslot(){
34 if(resposta.isEmpty() || resposta.contains("error")){ 34 if(resposta.isEmpty() || resposta.contains("error")){
35 //de vez enquando a conexão da erro, é bom tentar 2 vezes pra garantir. 35 //de vez enquando a conexão da erro, é bom tentar 2 vezes pra garantir.
36 resposta = OCacicComm->login(&ok); 36 resposta = OCacicComm->login(&ok);
  37 + if(resposta.isEmpty() || resposta.contains("error")){
  38 + QLogger::QLog_Info("Cacic Daemon (Timer)", "Erro no login.");
  39 + return;
  40 + }
37 } 41 }
38 }catch (...){ 42 }catch (...){
39 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("Não foi possivel verificar a periodicidade no getConfig.json")); 43 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("Não foi possivel verificar a periodicidade no getConfig.json"));
@@ -45,27 +49,27 @@ void CacicTimer::mslot(){ @@ -45,27 +49,27 @@ void CacicTimer::mslot(){
45 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("getTeste() success.")); 49 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("getTeste() success."));
46 if(getConfig()){ 50 if(getConfig()){
47 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("getConfig() success.")); 51 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("getConfig() success."));
48 - //QStringList nomesModulos = verificarModulos();  
49 - //if ( !nomesModulos.empty() ) {  
50 - // foreach( QString nome, nomesModulos ) { 52 + // QStringList nomesModulos = verificarModulos();
  53 + // if ( !nomesModulos.empty() ) {
  54 + // foreach( QString nome, nomesModulos ) {
51 definirDirModulo(getApplicationDirPath(), "gercols"); 55 definirDirModulo(getApplicationDirPath(), "gercols");
52 cacicthread->setCMutex(cMutex); 56 cacicthread->setCMutex(cMutex);
53 cacicthread->setModuloDirPath(getDirProgram()); 57 cacicthread->setModuloDirPath(getDirProgram());
54 cacicthread->start(QThread::NormalPriority); 58 cacicthread->start(QThread::NormalPriority);
55 - //if(nome == "gercols"){  
56 - // Envio do json gerado na coleta  
57 - // bool ok;  
58 - // QJsonObject jsonColeta = ccacic->getJsonFromFile("coleta.json");  
59 - // OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);  
60 - //}  
61 - // }  
62 - // }  
63 - }else{  
64 - QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração.");  
65 - } 59 + // if(nome == "gercols"){
  60 + // //Envio do json gerado na coleta
  61 + // bool ok;
  62 + // QJsonObject jsonColeta = ccacic->getJsonFromFile("coleta.json");
  63 + // OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);
  64 + // }
  65 + // }
  66 + // }
66 }else{ 67 }else{
67 - QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na execução do getTest()."); 68 + QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração.");
68 } 69 }
  70 +}else{
  71 +QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na execução do getTest().");
  72 +}
69 } 73 }
70 74
71 void CacicTimer::verificarEIniciarQMutex(){ 75 void CacicTimer::verificarEIniciarQMutex(){
@@ -210,8 +214,8 @@ bool CacicTimer::Md5IsEqual(QVariant document01,QVariant document02){ @@ -210,8 +214,8 @@ bool CacicTimer::Md5IsEqual(QVariant document01,QVariant document02){
210 214
211 void CacicTimer::iniciarInstancias(){ 215 void CacicTimer::iniciarInstancias(){
212 logManager = QLogger::QLoggerManager::getInstance(); 216 logManager = QLogger::QLoggerManager::getInstance();
213 - logManager->addDestination(this->applicationDirPath + "/cacicLog.txt","Cacic Daemon (Timer)",QLogger::InfoLevel);  
214 - logManager->addDestination(this->applicationDirPath + "/cacicLog.txt","Cacic Daemon (Timer)",QLogger::ErrorLevel); 217 + logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Cacic Daemon (Timer)",QLogger::InfoLevel);
  218 + logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Cacic Daemon (Timer)",QLogger::ErrorLevel);
215 ccacic = new CCacic(); 219 ccacic = new CCacic();
216 timer = new QTimer(this); 220 timer = new QTimer(this);
217 cMutex = new QMutex(QMutex::Recursive); 221 cMutex = new QMutex(QMutex::Recursive);