refactoring

Eli de Faria Junior
1 parent bdcfe887
Showing 4 changed files with 23 additions and 4 deletions Show diff stats
cacic-daemon/cacicD/cacictimer.cpp
install-cacic/installcacic.cpp
install-cacic/installcacic.h
install-cacic/main.cpp
@@ -33,11 +33,16 @@ void CacicTimer::mslot(){
         QJsonObject resposta = OCacicComm->login(&ok);
         if(resposta.isEmpty() || resposta.contains("error")){
             //de vez enquando a conexão da erro, é bom tentar 2 vezes pra garantir.
+            QLogger::QLog_Info("Cacic Daemon (Timer)", "Erro no primeiro login.");
             resposta = OCacicComm->login(&ok);
             if(resposta.isEmpty() || resposta.contains("error")){
-                QLogger::QLog_Info("Cacic Daemon (Timer)", "Erro no login.");
+                QLogger::QLog_Info("Cacic Daemon (Timer)", "Erro no segundo login.");
                 return;
+            }else{
+                QLogger::QLog_Info("Cacic Daemon (Timer)", "getLogin() success.");
             }
+        }else{
+            QLogger::QLog_Info("Cacic Daemon (Timer)", "getLogin() success.");
         }
     }catch (...){
         QLogger::QLog_Info("Cacic Daemon (Timer)", QString("Não foi possivel verificar a periodicidade no getConfig.json"));
@@ -4,7 +4,8 @@ InstallCacic::InstallCacic(QObject *parent) :
     QObject(parent)
 {
     logManager = QLogger::QLoggerManager::getInstance();
-    logManager->addDestination("./install.log","Install",QLogger::DebugLevel);
+    logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Install Cacic",QLogger::InfoLevel);
+    logManager->addDestination(this->applicationDirPath + "/Logs/cacicLog.txt","Install Cacic",QLogger::ErrorLevel);
 }
 InstallCacic::~InstallCacic()
@@ -14,7 +15,7 @@ InstallCacic::~InstallCacic()
 void InstallCacic::run(QStringList argv, int argc) {
-    QLogger::QLog_Debug("Install", "Inicio de instalacao");
+    QLogger::QLog_Info("Install Cacic", QString("Inicio de instalacao"));
     oCacicComm = new CacicComm();
@@ -130,6 +131,16 @@ QMap&lt;QString, QString&gt; InstallCacic::validaParametros(QStringList argv, int argc
     }
     return map;
 }
+QString InstallCacic::getApplicationDirPath() const
+{
+    return applicationDirPath;
+}
+
+void InstallCacic::setApplicationDirPath(const QString &value)
+{
+    applicationDirPath = value;
+}
+
 QMap<QString, QString> InstallCacic::getArgumentos()
 {
@@ -20,14 +20,16 @@ public:
     void setArgumentos(QMap<QString, QString> value);
     QMap<QString, QString> validaParametros(QStringList argv, int argc, bool *ok);
     bool startProcess(QString pathprogram, bool wait, QStringList arguments);
-
     void registro();
+    void setApplicationDirPath(const QString &value);
+
 private:
     QMap<QString, QString> argumentos;
     CacicComm *oCacicComm;
     CACIC_Computer oCacicComputer;
     CCacic oCacic;
     QLogger::QLoggerManager *logManager;
+    QString applicationDirPath;
 signals:
     void finished();
@@ -9,6 +9,7 @@ int main(int argc, char *argv[])
     for (int i = 0; i<argc; i++)
         args.append(argv[i]);
     InstallCacic *installcacic = new InstallCacic(&a);
+    installcacic->setApplicationDirPath(a.applicationDirPath());
     // This will cause the application to exit when
     // the task signals finished.
	@@ -9,6 +9,7 @@ int main(int argc, char *argv[])		@@ -9,6 +9,7 @@ int main(int argc, char *argv[])
9	for (int i = 0; i<argc; i++)	9	for (int i = 0; i<argc; i++)
10	args.append(argv[i]);	10	args.append(argv[i]);
11	InstallCacic *installcacic = new InstallCacic(&a);	11	InstallCacic *installcacic = new InstallCacic(&a);
		12	+ installcacic->setApplicationDirPath(a.applicationDirPath());
12		13
13	// This will cause the application to exit when	14	// This will cause the application to exit when
14	// the task signals finished.	15	// the task signals finished.