From 42cc598ee61c0389b14770f1a29616692db3d9cb Mon Sep 17 00:00:00 2001
From: Thiago Rocha <thiroc80@gmail.com>
Date: Tue, 14 Oct 2014 12:46:33 -0300
Subject: [PATCH] Integrado CheckModules no CacicD.

---
 cacic-daemon/cacicD/cacicD.pro     |  6 ++++--
 cacic-daemon/cacicD/cacictimer.cpp |  7 +++++++
 cacic-daemon/cacicD/cacictimer.h   | 13 ++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/cacic-daemon/cacicD/cacicD.pro b/cacic-daemon/cacicD/cacicD.pro
index 6bc0573..02b0d08 100644
--- a/cacic-daemon/cacicD/cacicD.pro
+++ b/cacic-daemon/cacicD/cacicD.pro
@@ -32,7 +32,8 @@ SOURCES     += main.cpp \
                ../../src/wmi.cpp \
                ../../src/cacic_computer.cpp \
                ../../src/operatingsystem.cpp \
-               ../../src/QLogger.cpp
+               ../../src/QLogger.cpp \
+               ../../src/checkmodules.cpp
 
 
 HEADERS     += cacicd.h \
@@ -43,7 +44,8 @@ HEADERS     += cacicd.h \
                ../../src/cacic_computer.h \
                ../../src/operatingsystem.h \
                ../../src/cacic_comm.h \
-               ../../src/QLogger.h
+               ../../src/QLogger.h \
+               ../../src/checkmodules.h
 
 include(../../src/qtservice/src/qtservice.pri)
 
diff --git a/cacic-daemon/cacicD/cacictimer.cpp b/cacic-daemon/cacicD/cacictimer.cpp
index 717847b..7d000dc 100644
--- a/cacic-daemon/cacicD/cacictimer.cpp
+++ b/cacic-daemon/cacicD/cacictimer.cpp
@@ -13,6 +13,7 @@ CacicTimer::~CacicTimer()
     delete logManager;
     delete ccacic;
     delete OCacicComm;
+    delete checkModules;
 }
 
 void CacicTimer::reiniciarTimer(){
@@ -58,6 +59,10 @@ void CacicTimer::mslot(){
                 //            QStringList nomesModulos = verificarModulos();
                 //            if ( !nomesModulos.empty() ) {
                 //             foreach( QString nome, nomesModulos ) {
+
+                checkModules = new CheckModules(this->applicationDirPath);
+                checkModules->start();
+
                 QString nome = "gercols";
                 definirDirModulo(getApplicationDirPath(), nome);
                 cacicthread->setCcacic(ccacic);
@@ -66,6 +71,7 @@ void CacicTimer::mslot(){
                 cacicthread->setCMutex(cMutex);
                 cacicthread->setModuloDirPath(getDirProgram());
                 cacicthread->start(QThread::NormalPriority);
+
             }else{
                 QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração.");
             }
@@ -184,6 +190,7 @@ void CacicTimer::iniciarInstancias(){
     OCacicComm->setUrlGerente("teste.cacic.cc");
     OCacicComm->setUsuario("cacic");
     OCacicComm->setPassword("cacic123");
+
 }
 
 void CacicTimer::verificarPeriodicidadeJson()
diff --git a/cacic-daemon/cacicD/cacictimer.h b/cacic-daemon/cacicD/cacictimer.h
index 6b44bb8..60c13f8 100644
--- a/cacic-daemon/cacicD/cacictimer.h
+++ b/cacic-daemon/cacicD/cacictimer.h
@@ -13,6 +13,7 @@
 #include "cacic_computer.h"
 #include "QLogger.h"
 #include  "cacicthread.h"
+#include "checkmodules.h"
 
 class CacicTimer : public QObject
 {
@@ -37,18 +38,20 @@ private:
     bool verificarEIniciarQMutex();
     QStringList verificarModulos();
     void reiniciarTimer();
-    QLogger::QLoggerManager *logManager;
-    CacicThread *cacicthread;
-    QString dirProgram;
-    QString applicationDirPath;
     QString getDirProgram() const;
     void iniciarInstancias();
     void verificarPeriodicidadeJson();
     void lerArquivoConfig( const QJsonObject &jsonConfig);
     void definirDirModulo(QString appDirPath, QString nome);
+    int getPeriodicidadeExecucao() const;
+
+    QLogger::QLoggerManager *logManager;
+    CacicThread *cacicthread;
+    CheckModules *checkModules;
+    QString dirProgram;
+    QString applicationDirPath;
     QJsonObject jsonConfig;
     int periodicidadeExecucao = 14400; // 4*3600. Tempo default de execução.
-    int getPeriodicidadeExecucao() const;
 
 private slots:
     void mslot();
--
libgit2 0.21.2