This commit is contained in:
@ -96,6 +96,22 @@ set(EXTRA_LIBS
|
||||
)
|
||||
|
||||
|
||||
# Set paths for libraries before finding Drogon
|
||||
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}
|
||||
/usr/local/jsoncpp
|
||||
/usr/local/openssl-musl
|
||||
/usr/local/pgsql
|
||||
/usr/local/mariadb-connector-c
|
||||
/usr/local/sqlite3
|
||||
/usr/local/mysql
|
||||
/usr/local/cares
|
||||
/usr/local/curl
|
||||
)
|
||||
|
||||
# Explicitly set jsoncpp paths for Drogon's FindJsoncpp.cmake
|
||||
set(JSONCPP_INCLUDE_DIRS /usr/local/jsoncpp/include)
|
||||
set(JSONCPP_LIBRARIES /usr/local/jsoncpp/lib/libjsoncpp.a)
|
||||
|
||||
##########
|
||||
# If you include the drogon source code locally in your project, use this method to add drogon
|
||||
# add_subdirectory(external/drogon)
|
||||
@ -105,10 +121,17 @@ find_package(Drogon CONFIG REQUIRED)
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon)
|
||||
|
||||
|
||||
# Additional PostgreSQL libraries needed for static linking
|
||||
set(POSTGRESQL_EXTRA_LIBS
|
||||
/usr/local/pgsql/lib/libpgcommon.a
|
||||
/usr/local/pgsql/lib/libpgport.a
|
||||
)
|
||||
|
||||
# Link libraries
|
||||
target_link_libraries(${PROJECT_EXE_NAME} PRIVATE
|
||||
nlohmann_json::nlohmann_json
|
||||
Drogon::Drogon
|
||||
${POSTGRESQL_EXTRA_LIBS}
|
||||
${EXTRA_LIBS}
|
||||
)
|
||||
|
||||
|
@ -1,7 +1,10 @@
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
#include <thread>
|
||||
#include <chrono>
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include <drogon/HttpClient.h>
|
||||
#include <drogon/drogon.h>
|
||||
#include "version.hpp"
|
||||
#include "assert.hpp"
|
||||
|
||||
@ -14,24 +17,36 @@ int main() {
|
||||
std::cout << std::endl;
|
||||
std::cout << "Retrieving IP address..." << std::endl;
|
||||
|
||||
auto loop = trantor::EventLoop::getEventLoopOfCurrentThread();
|
||||
auto client = drogon::HttpClient::newHttpClient("http://ipinfo.io", loop);
|
||||
auto req = drogon::HttpRequest::newHttpRequest();
|
||||
req->setMethod(drogon::Get);
|
||||
req->setPath("/ip");
|
||||
// Initialize drogon app but don't run it
|
||||
drogon::app().setLogLevel(trantor::Logger::kError);
|
||||
|
||||
std::string ip_body;
|
||||
int status = 0;
|
||||
bool done = false;
|
||||
client->sendRequest(req, [&](drogon::ReqResult result, const drogon::HttpResponsePtr &resp) {
|
||||
if (result == drogon::ReqResult::Ok && resp) {
|
||||
ip_body = resp->body();
|
||||
status = resp->statusCode();
|
||||
} else {
|
||||
status = 0;
|
||||
}
|
||||
done = true;
|
||||
|
||||
// Run in a separate thread to avoid event loop conflicts
|
||||
std::thread worker([&]() {
|
||||
trantor::EventLoop loop;
|
||||
auto client = drogon::HttpClient::newHttpClient("http://ipinfo.io", &loop);
|
||||
auto req = drogon::HttpRequest::newHttpRequest();
|
||||
req->setMethod(drogon::Get);
|
||||
req->setPath("/ip");
|
||||
|
||||
client->sendRequest(req, [&](drogon::ReqResult result, const drogon::HttpResponsePtr &resp) {
|
||||
if (result == drogon::ReqResult::Ok && resp) {
|
||||
ip_body = resp->body();
|
||||
status = resp->statusCode();
|
||||
} else {
|
||||
status = 0;
|
||||
}
|
||||
done = true;
|
||||
loop.quit();
|
||||
});
|
||||
|
||||
loop.loop();
|
||||
});
|
||||
while (!done) loop->loopOnce();
|
||||
|
||||
worker.join();
|
||||
|
||||
ASSERT(status == 200, "Failed to get IP");
|
||||
|
||||
|
Reference in New Issue
Block a user