Download as
Browse Code »

Commit 7b3a3beeea70b5e15649e3c9093cd46591e2a745

Authored by Eric Menezes Noronha
2 parents f530971a 9dbfb645
Exists in master

Merge branch 'master' of https://github.com/lightbase/cacic-agente

Showing 6 changed files with 39 additions and 26 deletions   Show diff stats
cacic-daemon/cacicD/Readme.txt
  Diff comments   View file @7b3a3be
... ... @@ -11,4 +11,4 @@ Para instalar um serviço no Linux (TESTADO no Ubuntu 14.04):
11 11 2- criar um link simbolico para /etc/rc2.d/S99cacic
12 12 * sudo ln -s /etc/init.d/cacic /etc/rc2.d/S99cacic
13 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
  Diff comments   View file @7b3a3be
... ... @@ -10,8 +10,8 @@ cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv,
10 10 setServiceFlags(QtService::Default);
11 11  
12 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 15 } catch (...){
16 16 qCritical() << "Error desconhecido no construtor.";
17 17 QLogger::QLog_Error("Cacic Daemon", QString("Erro desconhecido no construtor."));
... ...
cacic-daemon/cacicD/cacicthread.cpp
  Diff comments   View file @7b3a3be
... ... @@ -51,6 +51,6 @@ void CacicThread::registraFimColeta(QString msg)
51 51  
52 52 void CacicThread::iniciarInstancias(){
53 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
  Diff comments   View file @7b3a3be
... ... @@ -33,7 +33,16 @@ void CacicTimer::mslot(){
33 33 QJsonObject resposta = OCacicComm->login(&ok);
34 34 if(resposta.isEmpty() || resposta.contains("error")){
35 35 //de vez enquando a conexão da erro, é bom tentar 2 vezes pra garantir.
  36 + QLogger::QLog_Info("Cacic Daemon (Timer)", "Erro no primeiro login.");
36 37 resposta = OCacicComm->login(&ok);
  38 + if(resposta.isEmpty() || resposta.contains("error")){
  39 + QLogger::QLog_Info("Cacic Daemon (Timer)", "Erro no segundo login.");
  40 + return;
  41 + }else{
  42 + QLogger::QLog_Info("Cacic Daemon (Timer)", "getLogin() success.");
  43 + }
  44 + }else{
  45 + QLogger::QLog_Info("Cacic Daemon (Timer)", "getLogin() success.");
37 46 }
38 47 }catch (...){
39 48 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("Não foi possivel verificar a periodicidade no getConfig.json"));
... ... @@ -45,27 +54,27 @@ void CacicTimer::mslot(){
45 54 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("getTeste() success."));
46 55 if(getConfig()){
47 56 QLogger::QLog_Info("Cacic Daemon (Timer)", QString("getConfig() success."));
48   - //QStringList nomesModulos = verificarModulos();
49   - //if ( !nomesModulos.empty() ) {
50   - // foreach( QString nome, nomesModulos ) {
  57 + // QStringList nomesModulos = verificarModulos();
  58 + // if ( !nomesModulos.empty() ) {
  59 + // foreach( QString nome, nomesModulos ) {
51 60 definirDirModulo(getApplicationDirPath(), "gercols");
52 61 cacicthread->setCMutex(cMutex);
53 62 cacicthread->setModuloDirPath(getDirProgram());
54 63 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   - }
  64 + // if(nome == "gercols"){
  65 + // //Envio do json gerado na coleta
  66 + // bool ok;
  67 + // QJsonObject jsonColeta = ccacic->getJsonFromFile("coleta.json");
  68 + // OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);
  69 + // }
  70 + // }
  71 + // }
66 72 }else{
67   - QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na execução do getTest().");
  73 + QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração.");
68 74 }
  75 +}else{
  76 +QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na execução do getTest().");
  77 +}
69 78 }
70 79  
71 80 void CacicTimer::verificarEIniciarQMutex(){
... ... @@ -210,8 +219,8 @@ bool CacicTimer::Md5IsEqual(QVariant document01,QVariant document02){
210 219  
211 220 void CacicTimer::iniciarInstancias(){
212 221 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);
  222 + logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Cacic Daemon (Timer)",QLogger::InfoLevel);
  223 + logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Cacic Daemon (Timer)",QLogger::ErrorLevel);
215 224 ccacic = new CCacic();
216 225 timer = new QTimer(this);
217 226 cMutex = new QMutex(QMutex::Recursive);
... ...
install-cacic/installcacic.cpp
  Diff comments   View file @7b3a3be
... ... @@ -3,8 +3,12 @@
3 3 InstallCacic::InstallCacic(QObject *parent) :
4 4 QObject(parent)
5 5 {
  6 + QDir dir;
  7 + this->applicationDirPath = dir.currentPath();
  8 +
6 9 logManager = QLogger::QLoggerManager::getInstance();
7   - logManager->addDestination("./install.log","Install",QLogger::DebugLevel);
  10 + logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Install Cacic",QLogger::InfoLevel);
  11 + logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Install Cacic",QLogger::ErrorLevel);
8 12 }
9 13  
10 14 InstallCacic::~InstallCacic()
... ... @@ -14,7 +18,7 @@ InstallCacic::~InstallCacic()
14 18  
15 19 void InstallCacic::run(QStringList argv, int argc) {
16 20  
17   - QLogger::QLog_Debug("Install", "Inicio de instalacao");
  21 + QLogger::QLog_Info("Install Cacic", QString("Inicio de instalacao"));
18 22  
19 23 oCacicComm = new CacicComm();
20 24  
... ... @@ -34,7 +38,6 @@ void InstallCacic::run(QStringList argv, int argc) {
34 38 oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
35 39 jsonComm["computador"] = oCacicComputer.toJsonObject();
36 40 QJsonObject configs = oCacicComm->comm("/ws/neo/config", &ok, jsonComm);
37   - qDebug () << configs;
38 41 if (ok){
39 42 oCacicComm->setUrlGerente(configs["reply"].toObject()["applicationUrl"].toString());
40 43 #ifdef Q_OS_WIN
... ...
install-cacic/installcacic.h
  Diff comments   View file @7b3a3be
... ... @@ -21,14 +21,15 @@ public:
21 21 void setArgumentos(QMap<QString, QString> value);
22 22 QMap<QString, QString> validaParametros(QStringList argv, int argc, bool *ok);
23 23 bool startProcess(QString pathprogram, bool wait, QStringList arguments);
24   -
25 24 void registro();
  25 +
26 26 private:
27 27 QMap<QString, QString> argumentos;
28 28 CacicComm *oCacicComm;
29 29 CACIC_Computer oCacicComputer;
30 30 CCacic oCacic;
31 31 QLogger::QLoggerManager *logManager;
  32 + QString applicationDirPath;
32 33 signals:
33 34 void finished();
34 35  
... ...