Commit 42cc598ee61c0389b14770f1a29616692db3d9cb
1 parent
a04f5df4
Exists in
master
Integrado CheckModules no CacicD.
Showing
3 changed files
with
19 additions
and
7 deletions
Show diff stats
cacic-daemon/cacicD/cacicD.pro
... | ... | @@ -32,7 +32,8 @@ SOURCES += main.cpp \ |
32 | 32 | ../../src/wmi.cpp \ |
33 | 33 | ../../src/cacic_computer.cpp \ |
34 | 34 | ../../src/operatingsystem.cpp \ |
35 | - ../../src/QLogger.cpp | |
35 | + ../../src/QLogger.cpp \ | |
36 | + ../../src/checkmodules.cpp | |
36 | 37 | |
37 | 38 | |
38 | 39 | HEADERS += cacicd.h \ |
... | ... | @@ -43,7 +44,8 @@ HEADERS += cacicd.h \ |
43 | 44 | ../../src/cacic_computer.h \ |
44 | 45 | ../../src/operatingsystem.h \ |
45 | 46 | ../../src/cacic_comm.h \ |
46 | - ../../src/QLogger.h | |
47 | + ../../src/QLogger.h \ | |
48 | + ../../src/checkmodules.h | |
47 | 49 | |
48 | 50 | include(../../src/qtservice/src/qtservice.pri) |
49 | 51 | ... | ... |
cacic-daemon/cacicD/cacictimer.cpp
... | ... | @@ -13,6 +13,7 @@ CacicTimer::~CacicTimer() |
13 | 13 | delete logManager; |
14 | 14 | delete ccacic; |
15 | 15 | delete OCacicComm; |
16 | + delete checkModules; | |
16 | 17 | } |
17 | 18 | |
18 | 19 | void CacicTimer::reiniciarTimer(){ |
... | ... | @@ -58,6 +59,10 @@ void CacicTimer::mslot(){ |
58 | 59 | // QStringList nomesModulos = verificarModulos(); |
59 | 60 | // if ( !nomesModulos.empty() ) { |
60 | 61 | // foreach( QString nome, nomesModulos ) { |
62 | + | |
63 | + checkModules = new CheckModules(this->applicationDirPath); | |
64 | + checkModules->start(); | |
65 | + | |
61 | 66 | QString nome = "gercols"; |
62 | 67 | definirDirModulo(getApplicationDirPath(), nome); |
63 | 68 | cacicthread->setCcacic(ccacic); |
... | ... | @@ -66,6 +71,7 @@ void CacicTimer::mslot(){ |
66 | 71 | cacicthread->setCMutex(cMutex); |
67 | 72 | cacicthread->setModuloDirPath(getDirProgram()); |
68 | 73 | cacicthread->start(QThread::NormalPriority); |
74 | + | |
69 | 75 | }else{ |
70 | 76 | QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração."); |
71 | 77 | } |
... | ... | @@ -184,6 +190,7 @@ void CacicTimer::iniciarInstancias(){ |
184 | 190 | OCacicComm->setUrlGerente("teste.cacic.cc"); |
185 | 191 | OCacicComm->setUsuario("cacic"); |
186 | 192 | OCacicComm->setPassword("cacic123"); |
193 | + | |
187 | 194 | } |
188 | 195 | |
189 | 196 | void CacicTimer::verificarPeriodicidadeJson() | ... | ... |
cacic-daemon/cacicD/cacictimer.h
... | ... | @@ -13,6 +13,7 @@ |
13 | 13 | #include "cacic_computer.h" |
14 | 14 | #include "QLogger.h" |
15 | 15 | #include "cacicthread.h" |
16 | +#include "checkmodules.h" | |
16 | 17 | |
17 | 18 | class CacicTimer : public QObject |
18 | 19 | { |
... | ... | @@ -37,18 +38,20 @@ private: |
37 | 38 | bool verificarEIniciarQMutex(); |
38 | 39 | QStringList verificarModulos(); |
39 | 40 | void reiniciarTimer(); |
40 | - QLogger::QLoggerManager *logManager; | |
41 | - CacicThread *cacicthread; | |
42 | - QString dirProgram; | |
43 | - QString applicationDirPath; | |
44 | 41 | QString getDirProgram() const; |
45 | 42 | void iniciarInstancias(); |
46 | 43 | void verificarPeriodicidadeJson(); |
47 | 44 | void lerArquivoConfig( const QJsonObject &jsonConfig); |
48 | 45 | void definirDirModulo(QString appDirPath, QString nome); |
46 | + int getPeriodicidadeExecucao() const; | |
47 | + | |
48 | + QLogger::QLoggerManager *logManager; | |
49 | + CacicThread *cacicthread; | |
50 | + CheckModules *checkModules; | |
51 | + QString dirProgram; | |
52 | + QString applicationDirPath; | |
49 | 53 | QJsonObject jsonConfig; |
50 | 54 | int periodicidadeExecucao = 14400; // 4*3600. Tempo default de execução. |
51 | - int getPeriodicidadeExecucao() const; | |
52 | 55 | |
53 | 56 | private slots: |
54 | 57 | void mslot(); | ... | ... |