BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove debug prints of Http for now

Browse Source
This commit is contained in:
Lion Kortlepel 2021-02-17 01:32:08 +01:00 committed by Anonymous275
parent cc5a878692
commit 92a67c7305
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/Common.h
View File

@ -76,14 +76,14 @@ static inline void luaprint(const std::string& str) {
} }
*/ */
#define warn(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [WARN] ") + (x)); #define warn(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [WARN] ") + (x))
#define info(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [INFO] ") + (x)); #define info(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [INFO] ") + (x))
#define error(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [ERROR] ") + (x)); #define error(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [ERROR] ") + (x))
#define luaprint(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [LUA] ") + (x)); #define luaprint(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [LUA] ") + (x))
#define debug(x) \ #define debug(x) \
do { \ do { \
if (Application::Settings.DebugModeEnabled) { \ if (Application::Settings.DebugModeEnabled) { \
Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [DEBUG] ") + (x)) \ Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [DEBUG] ") + (x)); \
} \ } \
} while (false) } while (false)

12
src/Http.cpp
View File

@ -1,6 +1,6 @@
#include "Http.h" #include "Http.h"
#include "Common.h" //#include "Common.h"
#include <boost/asio/connect.hpp> #include <boost/asio/connect.hpp>
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
#include <boost/beast.hpp> #include <boost/beast.hpp>
@ -47,7 +47,7 @@ std::string Http::GET(const std::string& host, int port, const std::string& targ
return result; return result;
} catch (const std::exception& e) { } catch (const std::exception& e) {
error(e.what()); //error(e.what());
return "-1"; return "-1";
} }
} }
@ -71,7 +71,7 @@ std::string Http::POST(const std::string& host, const std::string& target, const
boost::system::error_code ec { static_cast<int>(::ERR_get_error()), boost::asio::error::get_ssl_category() }; boost::system::error_code ec { static_cast<int>(::ERR_get_error()), boost::asio::error::get_ssl_category() };
// FIXME: we could throw and crash, if we like // FIXME: we could throw and crash, if we like
// throw boost::system::system_error { ec }; // throw boost::system::system_error { ec };
debug("POST " + host + target + " failed."); //debug("POST " + host + target + " failed.");
return false; return false;
} }
beast::get_lowest_layer(stream).connect(results); beast::get_lowest_layer(stream).connect(results);
@ -85,7 +85,7 @@ std::string Http::POST(const std::string& host, const std::string& target, const
//debug("IPv6 connect failed, trying IPv4"); //debug("IPv6 connect failed, trying IPv4");
bool ok = try_connect_with_protocol(tcp::v4()); bool ok = try_connect_with_protocol(tcp::v4());
if (!ok) { if (!ok) {
error("failed to resolve or connect in POST " + host + target); //error("failed to resolve or connect in POST " + host + target);
return "-1"; return "-1";
} }
//} //}
@ -133,11 +133,11 @@ std::string Http::POST(const std::string& host, const std::string& target, const
// info(result.str()); // info(result.str());
std::string debug_response_str; std::string debug_response_str;
std::getline(result, debug_response_str); std::getline(result, debug_response_str);
debug("POST " + host + target + ": " + debug_response_str); //debug("POST " + host + target + ": " + debug_response_str);
return std::string(response.body()); return std::string(response.body());
} catch (const std::exception& e) { } catch (const std::exception& e) {
error(e.what()); //error(e.what());
return "-1"; return "-1";
} }
} }