Algumas mudanças no install-cacic; e começando já a comparação de binários locai…

…s e do servidor de acordo com o getConfig().

Algumas mudanças no install-cacic; e começando já a comparação de binários locai…
…s e do servidor de acordo com o getConfig().
Thiago Rocha
1 parent abdd064e
Showing 6 changed files with 63 additions and 12 deletions Show diff stats
cacic-daemon/cacicD/cacicd.cpp
cacic-daemon/cacicD/cacictimer.cpp
cacic-daemon/cacicD/cacictimer.h
install-cacic/install-cacic.pro
install-cacic/installcacic.cpp
install-cacic/installcacic.h
@@ -36,6 +36,7 @@ void cacicD::start() {
         QLogger::QLog_Info("Cacic Daemon", QString("Servico iniciado em ").append(application()->applicationDirPath()).append("."));
         QJsonObject result = ccacic->getJsonFromFile(application()->applicationDirPath() + "/getConfig.json");
+
         if(!result.contains("error") && !result.isEmpty()){
             Ocacictimer->iniciarTimer(result["codestatus"].toInt(), application()->applicationDirPath());
         }else{
@@ -5,14 +5,15 @@ CacicTimer::CacicTimer()
     OCacicComm = new CacicComm();
     ccacic = new CCacic();
     timer = new QTimer(this);
-    //manager = QLogger::QLoggerManager::getInstance();
-    //manager->addDestination("cacicLog.txt", QStringList("CacicD"), QLogger::LogLevel);
+    logManager = QLogger::QLoggerManager::getInstance();
     connect(timer,SIGNAL(timeout()),this,SLOT(mslot()));
 }
 void CacicTimer::iniciarTimer(int x, QString applicationDirPath)
 {
     setApplicationDirPath(applicationDirPath);
+    logManager->addDestination(getApplicationDirPath().append("/cacicLog.txt"), QStringList("Cacic Daemon"), QLogger::InfoLevel);
+    logManager->addDestination(getApplicationDirPath().append("/cacicLog.txt"), QStringList("Cacic Daemon"), QLogger::ErrorLevel);
     timer->start(x);
 }
@@ -21,14 +22,51 @@ void CacicTimer::mslot(){
         //manager->QLogger::QLog_Trace("ModuleName", "Message: ");
         if(getConfig()){
             qDebug() << "getConfig() success. - " + QDateTime::currentDateTime().toLocalTime().toString();
+            QLogger::QLog_Info("Cacic Daemon", "getConfig() executado com sucesso.");
+
+            // Compara o novo arquivo de configuração com um antigo e se forem diferentes
+            // mantem o mais recente; caso iguais simplesmente apaga o novo.
+            QFile *fileConfig = new QFile(getApplicationDirPath().append("/getConfig.json"));
+            QFile *fileConfigNew = new QFile(getApplicationDirPath().append("/getConfigNew.json"));
+
+            if( fileConfig->exists() && fileConfigNew->exists() ){
+                if( Md5IsEqual(QVariant::fromValue(fileConfig), QVariant::fromValue(fileConfigNew)) ) {
+                    fileConfigNew->remove();
+                    delete fileConfigNew;
+                } else {
+                    // Renomeia getConfigNew.json para getConfig.json
+                    fileConfig->remove();
+                    delete fileConfig;
+                    fileConfigNew->rename("getConfigNew.json","getConfig.json");
+                    delete fileConfigNew;
+                }
+                jsonConfig = ccacic->getJsonFromFile(getApplicationDirPath().append("/getConfig.json"));
+            } else if( fileConfig->exists() ){
+                jsonConfig = ccacic->getJsonFromFile(getApplicationDirPath().append("/getConfig.json"));
+            } else {
+                QLogger::QLog_Error("Cacic Daemon", "Arquivo de configuração não criado.");
+            }
+
+            /* lê json de configurações e armazena quais módulos executáveis.
+             * E faz o mesmo tipo de comparação de hashs, com o fim de:
+             * ou mantem o binário do módulo ou baixa um novo.
+             */
+            foreach( QVariant vectorsContent, jsonConfig["modulos"].toArray().toVariantList().toVector() )
+                moduleList.append( vectorsContent.toString() );
+
+            foreach( QString modulo, moduleList ) {
+
+            }
             //aqui irá abrir o semaforo e iniciar a coleta.
         }else{
             qDebug() << "getConfig() failed. - " + QDateTime::currentDateTime().toLocalTime().toString();
+            QLogger::QLog_Error("Cacic Daemon", "Falha na obtenção do arquivo de configuração.");
         }
     }else{
         qDebug() << "getTest() failed. - " + QDateTime::currentDateTime().toLocalTime().toString();
+        QLogger::QLog_Error("Cacic Daemon", "Falha na execução do getTest().");
     }
 }
@@ -70,7 +108,7 @@ bool CacicTimer::getConfig(){
             return false;
         }
         try{
-            ccacic->setJsonToFile(jsonresult, getApplicationDirPath() + "/getConfig.json");
+            ccacic->setJsonToFile(jsonresult, getApplicationDirPath().append("/getConfigNew.json"));
             return true;
         } catch (...) {
             qDebug() << "Erro ao salvar o arquivo de configurações.";
@@ -101,11 +139,11 @@ void CacicTimer::registraFim()
 {
 }
-bool CacicTimer::compararHashMD5(QJsonDocument getconfigfile,QJsonDocument getConfig){
+bool CacicTimer::Md5IsEqual(QVariant document01,QVariant document02){
     QString getconfigMD5 = QString(QCryptographicHash::hash(
-                                       (getconfigfile.toVariant().toByteArray()),QCryptographicHash::Md5).toHex());
+                                       (document01.toByteArray()),QCryptographicHash::Md5).toHex());
     QString getconfigMD52 = QString(QCryptographicHash::hash(
-                                        (getConfig.toVariant().toByteArray()),QCryptographicHash::Md5).toHex());
+                                        (document02.toByteArray()),QCryptographicHash::Md5).toHex());
     if(getconfigMD5 == getconfigMD52){
         return true;
     }else{
@@ -23,14 +23,18 @@ public:
     void iniciarTimer(int x, QString applicationDirPath);
     bool getTest();
     bool getConfig();
-    bool compararHashMD5(QJsonDocument getconfigfile,QJsonDocument getConfig);
+    bool Md5IsEqual(QVariant document01,QVariant document02);
     QString getApplicationDirPath() const;
     void setApplicationDirPath(const QString &value);
 private:
     void registraFim();
     void registraInicio();
+
+    QJsonObject jsonConfig;
+    QLogger::QLoggerManager *logManager;
     QString applicationDirPath;
+    QStringList moduleList;
 private slots:
     void mslot();
@@ -7,7 +7,6 @@
 QT += core
 QT += network
 QT -= gui
-QT += axcontainer
 TARGET = install-cacic
 CONFIG += console
@@ -16,6 +15,7 @@ CONFIG += c++11
 win32 {
     LIBS += -LE:\LightBase\cacic-agente-project\cacic-agente\src\crypto++\lib -lcryptopp
+    QT += axcontainer
 } else {
     LIBS += -L/usr/lib -lcryptopp
 }
@@ -27,7 +27,8 @@ SOURCES += main.cpp \
     ../src/ccacic.cpp \
     ../src/cacic_computer.cpp \
     ../src/operatingsystem.cpp \
-    ../src/wmi.cpp
+    ../src/wmi.cpp \
+    ../src/QLogger.cpp
 HEADERS += \
     installcacic.h \
@@ -35,7 +36,8 @@ HEADERS += \
     ../src/cacic_computer.h \
     ../src/cacic_comm.h \
     ../src/operatingsystem.h \
-    ../src/wmi.h
+    ../src/wmi.h \
+    ../src/QLogger.h
 INCLUDEPATH += ../src \
                ../src/crypto++/include/
@@ -3,10 +3,13 @@
 InstallCacic::InstallCacic(QObject *parent) :
     QObject(parent)
 {
-
+    logManager = QLogger::QLoggerManager::getInstance();
+    logManager->addDestination("./log.txt","Install",QLogger::DebugLevel);
 }
 void InstallCacic::run(QStringList argv, int argc) {
+
+    QLogger::QLog_Debug("Install", "Inicio de instalacao");
     bool ok;
     //valida os parametros repassados
     QMap<QString, QString> param = validaParametros(argv, argc, &ok);
@@ -21,7 +24,7 @@ void InstallCacic::run(QStringList argv, int argc) {
             oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
 #ifdef Q_OS_WIN
             oCacic.setCacicMainFolder("c:/cacic");
-#elif Q_LINUX
+#elif defined(Q_OS_LINUX)
             oCacic.setCacicMainFolder("/home/cacic");
 #endif
             oCacic.createFolder(oCacic.getCacicMainFolder());
@@ -57,6 +60,7 @@ void InstallCacic::run(QStringList argv, int argc) {
                   << "  [-help]                   Lista todos comandos.\n";
     }
+    logManager->closeLogger();
     emit finished();
 }
@@ -7,6 +7,7 @@
 #include <cacic_computer.h>
 #include <ccacic.h>
 #include "iostream"
+#include "QLogger.h"
 class InstallCacic : public QObject
 {
@@ -25,6 +26,7 @@ private:
     CacicComm oCacicComm;
     CACIC_Computer oCacicComputer;
     CCacic oCacic;
+    QLogger::QLoggerManager *logManager;
 signals:
     void finished();
	@@ -36,6 +36,7 @@ void cacicD::start() {		@@ -36,6 +36,7 @@ void cacicD::start() {
36	QLogger::QLog_Info("Cacic Daemon", QString("Servico iniciado em ").append(application()->applicationDirPath()).append("."));	36	QLogger::QLog_Info("Cacic Daemon", QString("Servico iniciado em ").append(application()->applicationDirPath()).append("."));
37		37
38	QJsonObject result = ccacic->getJsonFromFile(application()->applicationDirPath() + "/getConfig.json");	38	QJsonObject result = ccacic->getJsonFromFile(application()->applicationDirPath() + "/getConfig.json");
		39	+
39	if(!result.contains("error") && !result.isEmpty()){	40	if(!result.contains("error") && !result.isEmpty()){
40	Ocacictimer->iniciarTimer(result["codestatus"].toInt(), application()->applicationDirPath());	41	Ocacictimer->iniciarTimer(result["codestatus"].toInt(), application()->applicationDirPath());
41	}else{	42	}else{