vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: logs PR feedback: change text log format to: LEVEL [function_name] message | additional=data

Browse source
This commit is contained in:
Pierrick HYMBERT 2024-02-25 11:24:32 +01:00
parent c6c9f7cfd4
commit a69c446f4b
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
examples/server/utils.hpp
View file

@ -134,7 +134,7 @@ struct completion_token_output
std::string text_to_send; std::string text_to_send;
}; };
static void server_log(const char *level, const char *function, int line, const char *message, const nlohmann::ordered_json &extra) static inline void server_log(const char *level, const char *function, int line, const char *message, const nlohmann::ordered_json &extra)
{ {
std::stringstream ss_tid; std::stringstream ss_tid;
ss_tid << std::this_thread::get_id(); ss_tid << std::this_thread::get_id();
@ -155,18 +155,16 @@ static void server_log(const char *level, const char *function, int line, const
log.merge_patch(extra); log.merge_patch(extra);
} }
const std::string str = log.dump(-1, ' ', false, json::error_handler_t::replace); std::cout << log.dump(-1, ' ', false, json::error_handler_t::replace) << "\n" << std::flush;
printf("%.*s\n", (int)str.size(), str.data());
fflush(stdout);
} else { } else {
char buf[1024]; char buf[1024];
snprintf(buf, 1024, "%24s %4s: %-80s", function, level, message); snprintf(buf, 1024, "%4s [%24s] %s", level, function, message);
if (!extra.empty()) { if (!extra.empty()) {
log.merge_patch(extra); log.merge_patch(extra);
} }
std::stringstream ss; std::stringstream ss;
ss << buf; ss << buf << " |";
for (const auto& el : log.items()) for (const auto& el : log.items())
{ {
const std::string value = el.value().dump(-1, ' ', false, json::error_handler_t::replace); const std::string value = el.value().dump(-1, ' ', false, json::error_handler_t::replace);
@ -430,7 +428,6 @@ struct llama_server_response {
condition_results.wait(lock, [&]{ condition_results.wait(lock, [&]{
return !queue_results.empty(); return !queue_results.empty();
}); });
LOG_VERBOSE("condition_results unblock", {{"task_id", task_id}});
for (int i = 0; i < (int) queue_results.size(); i++) for (int i = 0; i < (int) queue_results.size(); i++)
{ {