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

server : change message format of server_log()

Browse source
This commit is contained in:
Georgi Gerganov 2024-02-24 15:03:08 +02:00
parent 65e65fd6c0
commit f23aa90994
No known key found for this signature in database
GPG key ID: 449E073F9DC10735
2 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/server/server.cpp
View file

@ -2592,14 +2592,16 @@ static json format_partial_response(
static json format_tokenizer_response(const std::vector<llama_token> &tokens)
{
return json{
{"tokens", tokens}};
return json {
{"tokens", tokens}
};
}
static json format_detokenized_response(std::string content)
{
return json{
{"content", content}};
return json {
{"content", content}
};
}

36
examples/server/utils.hpp
View file

@ -32,9 +32,9 @@ extern bool server_verbose;
} while (0)
#endif
#define LOG_ERROR( MSG, ...) server_log("ERROR", __func__, __LINE__, MSG, __VA_ARGS__)
#define LOG_WARNING(MSG, ...) server_log("WARNING", __func__, __LINE__, MSG, __VA_ARGS__)
#define LOG_INFO( MSG, ...) server_log("INFO", __func__, __LINE__, MSG, __VA_ARGS__)
#define LOG_ERROR( MSG, ...) server_log("ERR", __func__, __LINE__, MSG, __VA_ARGS__)
#define LOG_WARNING(MSG, ...) server_log("WARN", __func__, __LINE__, MSG, __VA_ARGS__)
#define LOG_INFO( MSG, ...) server_log("INFO", __func__, __LINE__, MSG, __VA_ARGS__)
//
// parallel
@ -136,19 +136,25 @@ struct completion_token_output
static inline void server_log(const char *level, const char *function, int line,
const char *message, const nlohmann::ordered_json &extra)
{
nlohmann::ordered_json log
{
{"timestamp", time(nullptr)},
{"level", level},
{"function", function},
{"line", line},
{"message", message},
};
char buf[1024];
snprintf(buf, 1024, "%24s %4s: %-80s", function, level, message);
auto thread_id = std::this_thread::get_id();
std::stringstream ss_thread_id;
ss_thread_id << thread_id;
log.push_back({"thread_id", ss_thread_id.str()});
nlohmann::ordered_json log;
{
std::stringstream ss_thread_id;
ss_thread_id << std::this_thread::get_id();
log.push_back({"tid", ss_thread_id.str()});
}
log.merge_patch(
{
//{"timestamp", time(nullptr)},
//{"level", level},
//{"function", function},
//{"line", line},
{"msg", buf},
});
if (!extra.empty())
{