MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-30 04:38:52 +02:00
Code Issues Releases Wiki Activity

ircd::db::database::env: Add missing fdno in log output.

Browse source 
ircd::db: Add missing validator in debug.
This commit is contained in:
Jason Volk 2019-07-21 16:16:30 -07:00
parent 5377d46ec5
commit 62f861c54a
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ircd/db.cc
View file

@ -7109,7 +7109,7 @@ ircd::db::commit(database &d,
#ifdef RB_DEBUG #ifdef RB_DEBUG
log::debug log::debug
{ {
log, "'%s' %lu COMMIT %s in %ld$us", log, "'%s': %lu COMMIT %s in %ld$us",
d.name, d.name,
sequence(d), sequence(d),
debug(batch), debug(batch),
@ -7236,10 +7236,11 @@ ircd::db::_seek(database::column &c,
#ifdef RB_DEBUG_DB_SEEK #ifdef RB_DEBUG_DB_SEEK
log::debug log::debug
{ {
log, "'%s' %lu:%lu SEEK %s in %ld$us '%s'", log, "'%s': %lu:%lu SEEK %s %s in %ld$us '%s'",
name(d), name(d),
sequence(d), sequence(d),
sequence(opts.snapshot), sequence(opts.snapshot),
valid(it)? "VALID" : "INVALID",
it.status().ToString(), it.status().ToString(),
timer.at<microseconds>().count(), timer.at<microseconds>().count(),
name(c) name(c)
@ -7269,7 +7270,7 @@ ircd::db::_seek(database::column &c,
#ifdef RB_DEBUG_DB_SEEK #ifdef RB_DEBUG_DB_SEEK
log::debug log::debug
{ {
log, "'%s' %lu:%lu SEEK[%s] %s -> %s in %ld$us '%s'", log, "'%s': %lu:%lu SEEK[%s] %s -> %s in %ld$us '%s'",
name(d), name(d),
sequence(d), sequence(d),
sequence(opts.snapshot), sequence(opts.snapshot),

30
ircd/db_env.cc
View file

@ -1402,9 +1402,10 @@ noexcept try
#ifdef RB_DEBUG_DB_ENV #ifdef RB_DEBUG_DB_ENV
log::debug log::debug
{ {
log, "'%s': wfile:%p sync", log, "'%s': wfile:%p fd:%d sync",
d.name, d.name,
this this,
int(fd),
}; };
#endif #endif
@ -1416,10 +1417,11 @@ catch(const std::system_error &e)
{ {
log::error log::error
{ {
log, "'%s': wfile:%p sync :%s", log, "'%s': wfile:%p fd:%d sync :%s",
d.name, d.name,
this, this,
e.what() int(fd),
e.what(),
}; };
return error_to_status{e}; return error_to_status{e};
@ -1428,10 +1430,11 @@ catch(const std::exception &e)
{ {
log::error log::error
{ {
log, "'%s': wfile:%p sync :%s", log, "'%s': wfile:%p fd:%d sync :%s",
d.name, d.name,
this, this,
e.what() int(fd),
e.what(),
}; };
return error_to_status{e}; return error_to_status{e};
@ -1447,9 +1450,10 @@ noexcept try
#ifdef RB_DEBUG_DB_ENV #ifdef RB_DEBUG_DB_ENV
log::debug log::debug
{ {
log, "'%s': wfile:%p fsync", log, "'%s': wfile:%p fd:%d fsync",
d.name, d.name,
this this,
int(fd),
}; };
#endif #endif
@ -1461,10 +1465,11 @@ catch(const std::system_error &e)
{ {
log::error log::error
{ {
log, "'%s': wfile:%p fsync :%s", log, "'%s': wfile:%p fd:%d fsync :%s",
d.name, d.name,
this, this,
e.what() int(fd),
e.what(),
}; };
return error_to_status{e}; return error_to_status{e};
@ -1473,10 +1478,11 @@ catch(const std::exception &e)
{ {
log::error log::error
{ {
log, "'%s': wfile:%p fsync :%s", log, "'%s': wfile:%p fd:%d fsync :%s",
d.name, d.name,
this, this,
e.what() int(fd),
e.what(),
}; };
return error_to_status{e}; return error_to_status{e};