Jun 16th update

core/message/http_core.cc

@@ -16,14 +16,10 @@
 #include <algorithm>
 #include <iostream>
 
-#include "sasal.h"
-
 using namespace std;
 
 USE_DEBUG_FLAG(D_HTTP_REQUEST);
 
-SASAL_START // Communication
-
 HTTPHeaders::HTTPHeaders(const string &http_data)
 {
     static const string end_of_headers = "\r\n\r\n";
@@ -109,5 +105,3 @@ HTTPHeaders::createHTTPHeader(const string &http_data)
     // To justify the compiler
     return HTTPHeaders();
 }
-
-SASAL_END

core/message/http_decoder.cc

@@ -13,10 +13,6 @@
 
 #include "http_decoder.h"
 
-#include "sasal.h"
-
-SASAL_START // Communication
-
 using namespace std;
 
 USE_DEBUG_FLAG(D_COMMUNICATION);
@@ -354,5 +350,3 @@ HTTPResponse::getResponse() const
     }
     return genError(string("Request failed, Error: ") + status_code_str + " " + status_code_message->second);
 }
-
-SASAL_END

core/message/http_encoder.cc

@@ -13,12 +13,9 @@
 
 #include "http_encoder.h"
 #include "debug.h"
-#include "sasal.h"
 
 using namespace std;
 
-SASAL_START // Communication
-
 USE_DEBUG_FLAG(D_COMMUNICATION);
 
 HTTPRequest::HTTPRequest(const string &_method_statement, const string &_host, const bool to_proxy)
@@ -172,5 +169,3 @@ HTTPEncoder::isOverSSL()
     over_ssl = true;
     return *this;
 };
-
-SASAL_END

core/message/message.cc

@@ -46,14 +46,11 @@
 #include "agent_details.h"
 #include "messaging_buffer/http_request_event.h"
 #include "boost/asio.hpp"
-#include "sasal.h"
 #include "message_metric.h"
 #include "smart_bio.h"
 #include "connkey.h"
 #include "agent_core_utilities.h"
 
-SASAL_START // Communication
-
 using namespace std;
 using namespace chrono;
 using namespace smartBIO;
@@ -343,6 +340,7 @@ public:
         }
         stringstream token_steam;
         token_steam << token_file.rdbuf();
+
         auto new_token = token_steam.str();
         if (access_token != new_token) {
             access_token = new_token;
@@ -2077,5 +2075,3 @@ ProtoMessageComp::preload()
     registerExpectedConfiguration<string>("message",   "Data printout type");
     registerExpectedConfiguration<uint32_t>("message", "Internal Fog error timeout");
 }
-
-SASAL_END