From cd08aaf4391305a5751b1fc675cfa2c4e22ed3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lais=20Frig=C3=A9rio?= <lfs@inf.ufpr.br>
Date: Wed, 7 Dec 2016 10:16:28 -0200
Subject: [PATCH] Issue #10: UPDATE - Parse config and proxy file
---
.../agent/include/agent/linux/datasid-conf.h | 11 +----
.../agent/include/agent/linux/datasid-parse.h | 1 -
.../agent/include/agent/linux/datasid-proxy.h | 3 ++
update/agent/src/linux/datasid-conf.cpp | 45 -------------------
4 files changed, 4 insertions(+), 56 deletions(-)
diff --git a/update/agent/include/agent/linux/datasid-conf.h b/update/agent/include/agent/linux/datasid-conf.h
index befda28e..aeddb1ef 100644
--- a/update/agent/include/agent/linux/datasid-conf.h
+++ b/update/agent/include/agent/linux/datasid-conf.h
@@ -64,17 +64,8 @@ class Conf{
int getUpdateTries() const;
int getUpdateTimeOut() const;
- int sizeDataDir();
- int sizeLogDir();
- int sizeProxyConf();
- int sizeWebService();
- int sizeDelay();
- int sizeDaysToExpireLOg();
- int sizeUpdateTries();
- int sizeUpdateTimeOut();
-
};
-bool checkFileConf(Conf& conf, Agent agent);
+bool setConf(Conf& conf, Agent agent, map<string,string>& content);
Conf datasid_conf(Agent agent);
#endif
\ No newline at end of file
diff --git a/update/agent/include/agent/linux/datasid-parse.h b/update/agent/include/agent/linux/datasid-parse.h
index 990c787d..243fe5f0 100644
--- a/update/agent/include/agent/linux/datasid-parse.h
+++ b/update/agent/include/agent/linux/datasid-parse.h
@@ -35,5 +35,4 @@ void parse ( string& line, map<string, string>& content);
bool readfile (const string file, map<string,string>& content);
bool spaceonly (const string& line);
void trim (string& str);
-
#endif
\ No newline at end of file
diff --git a/update/agent/include/agent/linux/datasid-proxy.h b/update/agent/include/agent/linux/datasid-proxy.h
index fdd01ef3..7c4cd288 100644
--- a/update/agent/include/agent/linux/datasid-proxy.h
+++ b/update/agent/include/agent/linux/datasid-proxy.h
@@ -22,9 +22,11 @@
*/
#include <locale>
#include <sstream>
+#include <map>
#include "datasid-agent.h"
#include "datasid-conf.h"
#include "datasid-parse.h"
+#include "datasid-proxy.h"
using namespace std;
@@ -47,5 +49,6 @@ class Proxy{
string getPassword() const;
};
+bool setProxy(Proxy& proxy, map<string,string>& content);
Proxy datasid_proxy(Conf conf);
#endif
\ No newline at end of file
diff --git a/update/agent/src/linux/datasid-conf.cpp b/update/agent/src/linux/datasid-conf.cpp
index ae42c29b..1ea98176 100644
--- a/update/agent/src/linux/datasid-conf.cpp
+++ b/update/agent/src/linux/datasid-conf.cpp
@@ -98,51 +98,6 @@ int Conf::getUpdateTimeOut() const{
return this->updateTimeOut;
}
-/*
- * size Functions
- * check if variables were setted.\
- */
-
-int Conf::sizeDataDir() {
- return this->dataDir.size();
-}
-
-int Conf::sizeLogDir() {
- return this->logDir.size();
-}
-
-int Conf::sizeProxyConf() {
- return this->proxyConf.size();
-}
-
-int Conf::sizeWebService() {
- return this->webService.size();
-}
-
-int Conf::sizeDelay() {
- ostringstream convert;
- convert << this->delay;
- return (convert.str()).size();
-}
-
-int Conf::sizeDaysToExpireLOg() {
- ostringstream convert;
- convert << this->daysToExpireLog;
- return (convert.str()).size();
-}
-
-int Conf::sizeUpdateTries() {
- ostringstream convert;
- convert << this->updateTries;
- return (convert.str()).size();
-}
-
-int Conf::sizeUpdateTimeOut() {
- ostringstream convert;
- convert << this->updateTimeOut;
- return (convert.str()).size();
-}
-
/*
* setConf Function
* If variables from config file setted,
--
GitLab