Cliente del Shared Server (Curl).

AndresOtero · Apr 28, 2016 · 777f5c7 · 777f5c7
1 parent 899f8f9
commit 777f5c7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/TinderTaller/include/ClientService.h b/TinderTaller/include/ClientService.h
@@ -14,13 +14,13 @@
 #include "ClientUtils.h"
 
 class ClientService {
-public:
-	ClientService();
-	virtual ~ClientService();
-	MemoryStruct getClientService(const char * url);
-	MemoryStruct postClientService(const char * url, const char * data);
-	MemoryStruct putClientService(const char * url, const char * data);
-	MemoryStruct deleteClientService(const char * url);
+	public:
+		ClientService();
+		virtual ~ClientService();
+		MemoryStruct getClientService(const char * url);
+		MemoryStruct postClientService(const char * url, const char * data);
+		MemoryStruct putClientService(const char * url, const char * data);
+		MemoryStruct deleteClientService(const char * url);
 };
 
 #endif /* SRC_CLIENTSERVICE_H_ */
diff --git a/TinderTaller/include/ClientUtils.h b/TinderTaller/include/ClientUtils.h
@@ -18,7 +18,6 @@ struct MemoryStruct {
 	size_t size;
 };
 
-
 static size_t writeMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp){
 	size_t realsize = size * nmemb;
 	struct MemoryStruct *mem = (struct MemoryStruct *)userp;

diff --git a/TinderTaller/include/SharedClient.h b/TinderTaller/include/SharedClient.h
@@ -25,7 +25,6 @@ class SharedClient {
 		msg_t * deleteUser(string userId);
 		msg_t * getInterests();
 		msg_t * setInterests(string & interests);
-
 	private:
 		ClientService * clientService;
 };

diff --git a/TinderTaller/src/CMakeLists.txt b/TinderTaller/src/CMakeLists.txt
@@ -30,7 +30,7 @@ add_library(libtindertaller SHARED ${SOURCES} ${DirUtils} ${DirHandlers})
  TARGET_LINK_LIBRARIES(tindertaller -ftest-coverage)
 TARGET_LINK_LIBRARIES(tindertaller rocksdb )
 TARGET_LINK_LIBRARIES(tindertaller jsoncpp )
-TARGET_LINK_LIBRARIES(tindertaller curl )
+TARGET_LINK_LIBRARIES(tindertaller curl  )
 
 
 
diff --git a/TinderTaller/src/ClientService.cpp b/TinderTaller/src/ClientService.cpp
@@ -203,3 +203,4 @@ MemoryStruct ClientService::deleteClientService(const char * url){
 	chunk.status = res;
 	return chunk;
 }
+
diff --git a/TinderTaller/src/Handlers/HandlerUsers.cpp b/TinderTaller/src/Handlers/HandlerUsers.cpp
@@ -64,17 +64,17 @@ msg_t HandlerUsers::postUser(struct http_message * hm) {
 		val["token"]=token;
 		string * result = new string();
 		result->append(jsonParse.valueToString(val));
-		msg.change(CREATED, result);
 
 		//Va a dar de alta el usuario en el Shared
 		SharedClient * sharedClient = new SharedClient();
 		string user = "";
 		user.append(hm->body.p);
 		msg_t * response = sharedClient->setUser(user);
-		msg.status = response->status;
-		msg.body = response->body;
+		delete response->body;
 		delete response;
 		delete sharedClient;
+
+		msg.change(CREATED, result);
 	} else {
 		LOG(WARNING)<<"Not success";
 		string * result = new string();

diff --git a/TinderTaller/src/SharedClient.cpp b/TinderTaller/src/SharedClient.cpp
@@ -9,6 +9,7 @@ SharedClient::SharedClient() {
 	this->clientService = new ClientService();
 }
 
+
 SharedClient::~SharedClient() {
 	LOG(INFO)<< "Borro Shared Cliente";
 	delete this->clientService;

diff --git a/TinderTaller/tests/CMakeLists.txt b/TinderTaller/tests/CMakeLists.txt
@@ -34,4 +34,4 @@ add_executable(Test ${_SOURCES_CPP_TESTS})
  TARGET_LINK_LIBRARIES(Test gtest_main)
  TARGET_LINK_LIBRARIES(Test pthread)
  TARGET_LINK_LIBRARIES(Test rocksdb )
- TARGET_LINK_LIBRARIES(Test curl )
+ TARGET_LINK_LIBRARIES(Test curl  )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -203,3 +203,4 @@ MemoryStruct ClientService::deleteClientService(const char * url){
		chunk.status = res;
		return chunk;
		}