hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-08 19:41:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove UT String from logging (#1184)

Browse source 
* Removed unnecessary utarray include

* Removed ut_string from logging

* Fix formatting
This commit is contained in:
Peter Schafhalter 2017-11-05 14:05:20 -08:00 • committed by Philipp Moritz
parent d06beacd84
commit 7215f7d228
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/common.cc
View file

@ -7,8 +7,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "utarray.h"
#include "io.h" #include "io.h"
#include <functional> #include <functional>

29
src/common/logging.cc
View file

@ -5,7 +5,6 @@
#include <sys/time.h> #include <sys/time.h>
#include <hiredis/hiredis.h> #include <hiredis/hiredis.h>
#include <utstring.h>
#include "state/redis.h" #include "state/redis.h"
#include "io.h" #include "io.h"
@ -55,17 +54,23 @@ void RayLogger_log(RayLogger *logger,
return; return;
} }
struct timeval tv; struct timeval tv;
UT_string *timestamp;
utstring_new(timestamp);
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
utstring_printf(timestamp, "%ld.%ld", tv.tv_sec, (long) tv.tv_usec); std::string timestamp =
std::to_string(tv.tv_sec) + "." + std::to_string(tv.tv_usec);
UT_string *formatted_message; /* Find number of bytes that would have been written for formatted_message
utstring_new(formatted_message); * size */
size_t formatted_message_size =
std::snprintf(nullptr, 0, log_fmt, timestamp.c_str(), "%b",
log_levels[log_level], event_type, message,
timestamp.c_str()) +
1;
/* Fill out everything except the client ID, which is binary data. */ /* Fill out everything except the client ID, which is binary data. */
utstring_printf(formatted_message, log_fmt, utstring_body(timestamp), "%b", char formatted_message[formatted_message_size];
log_levels[log_level], event_type, message, std::snprintf(formatted_message, formatted_message_size, log_fmt,
utstring_body(timestamp)); timestamp.c_str(), "%b", log_levels[log_level], event_type,
message, timestamp.c_str());
if (logger->is_direct) { if (logger->is_direct) {
DBHandle *db = (DBHandle *) logger->conn; DBHandle *db = (DBHandle *) logger->conn;
/* Fill in the client ID and send the message to Redis. */ /* Fill in the client ID and send the message to Redis. */
@ -73,7 +78,7 @@ void RayLogger_log(RayLogger *logger,
redisAsyncContext *context = get_redis_context(db, db->client); redisAsyncContext *context = get_redis_context(db, db->client);
int status = int status =
redisAsyncCommand(context, NULL, NULL, utstring_body(formatted_message), redisAsyncCommand(context, NULL, NULL, formatted_message,
(char *) db->client.id, sizeof(db->client.id)); (char *) db->client.id, sizeof(db->client.id));
if ((status == REDIS_ERR) || context->err) { if ((status == REDIS_ERR) || context->err) {
LOG_REDIS_DEBUG(context, "error while logging message to log table"); LOG_REDIS_DEBUG(context, "error while logging message to log table");
@ -82,10 +87,8 @@ void RayLogger_log(RayLogger *logger,
/* If we don't own a Redis connection, we leave our client /* If we don't own a Redis connection, we leave our client
* ID to be filled in by someone else. */ * ID to be filled in by someone else. */
int *socket_fd = (int *) logger->conn; int *socket_fd = (int *) logger->conn;
write_log_message(*socket_fd, utstring_body(formatted_message)); write_log_message(*socket_fd, formatted_message);
} }
utstring_free(formatted_message);
utstring_free(timestamp);
} }
void RayLogger_log_event(DBHandle *db, void RayLogger_log_event(DBHandle *db,