root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-12-25 10:54:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

server : fix OpenSSL build (remove obsolete LOG_INFO) (#9529)

Browse Source
This commit is contained in:
Eric Zhang 2024-09-18 14:28:20 +08:00 committed by GitHub
parent faf67b3de4
commit f799155ab8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/server/server.cpp
View File

@ -2254,14 +2254,6 @@ static void log_server_request(const httplib::Request & req, const httplib::Resp
return; return;
} }
//LOG_INFO("request", {
// {"remote_addr", req.remote_addr},
// {"remote_port", req.remote_port},
// {"status", res.status},
// {"method", req.method},
// {"path", req.path},
// {"params", req.params},
//});
LOG_INF("request: %s %s %s %d\n", req.method.c_str(), req.path.c_str(), req.remote_addr.c_str(), res.status); LOG_INF("request: %s %s %s %d\n", req.method.c_str(), req.path.c_str(), req.remote_addr.c_str(), res.status);
LOG_DBG("request: %s\n", req.body.c_str()); LOG_DBG("request: %s\n", req.body.c_str());
@ -2318,12 +2310,12 @@ int main(int argc, char ** argv) {
std::unique_ptr<httplib::Server> svr; std::unique_ptr<httplib::Server> svr;
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
if (params.ssl_file_key != "" && params.ssl_file_cert != "") { if (params.ssl_file_key != "" && params.ssl_file_cert != "") {
LOG_INFO("Running with SSL", {{"key", params.ssl_file_key}, {"cert", params.ssl_file_cert}}); LOG_INF("Running with SSL: key = %s, cert = %s\n", params.ssl_file_key.c_str(), params.ssl_file_cert.c_str());
svr.reset( svr.reset(
new httplib::SSLServer(params.ssl_file_cert.c_str(), params.ssl_file_key.c_str()) new httplib::SSLServer(params.ssl_file_cert.c_str(), params.ssl_file_key.c_str())
); );
} else { } else {
LOG_INFO("Running without SSL", {}); LOG_INF("Running without SSL\n");
svr.reset(new httplib::Server()); svr.reset(new httplib::Server());
} }
#else #else
@ -3108,7 +3100,6 @@ int main(int argc, char ** argv) {
std::thread t([&]() { svr->listen_after_bind(); }); std::thread t([&]() { svr->listen_after_bind(); });
svr->wait_until_ready(); svr->wait_until_ready();
//LOG_INFO("HTTP server is listening", log_data);
LOG_INF("%s: HTTP server is listening, hostname: %s, port: %d, http threads: %d\n", __func__, params.hostname.c_str(), params.port, params.n_threads_http); LOG_INF("%s: HTTP server is listening, hostname: %s, port: %d, http threads: %d\n", __func__, params.hostname.c_str(), params.port, params.n_threads_http);
// load the model // load the model