Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2 -> main] Move subjective bill log to all level of producer_plugin logger. #781

Merged
merged 8 commits into from
Mar 6, 2023
Merged

[3.2 -> main] Move subjective bill log to all level of producer_plugin logger. #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e377339
GH-768 Move subjective bill log to all level of producer_plugin logger.
heifner Mar 3, 2023
941b525
Merge pull request #773 from AntelopeIO/GH-768-logging-3.1
heifner Mar 4, 2023
f13bf0a
Merge remote-tracking branch 'origin/release/3.1' into GH-768-logging…
heifner Mar 4, 2023
0046163
GH-768 Move fc_tlog to logger.hpp
heifner Mar 4, 2023
8330758
GH-768 Log non TRX_TRACE trx logging to all (trace) level logger of p…
heifner Mar 4, 2023
a0ff189
kick ci/cd
heifner Mar 6, 2023
258a06a
Merge pull request #779 from AntelopeIO/GH-768-logging-3.2
heifner Mar 6, 2023
3ed53c2
Merge remote-tracking branch 'origin/release/3.2' into GH-768-logging…
heifner Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions libraries/libfc/include/fc/log/logger.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ namespace fc
# define FC_MULTILINE_MACRO_END } while (0)
#endif

#define fc_tlog( LOGGER, FORMAT, ... ) \
FC_MULTILINE_MACRO_BEGIN \
if( (LOGGER).is_enabled( fc::log_level::all ) ) \
(LOGGER).log( FC_LOG_MESSAGE( all, FORMAT, __VA_ARGS__ ) ); \
FC_MULTILINE_MACRO_END

#define fc_dlog( LOGGER, FORMAT, ... ) \
FC_MULTILINE_MACRO_BEGIN \
if( (LOGGER).is_enabled( fc::log_level::debug ) ) \
Expand Down
8 changes: 4 additions & 4 deletions plugins/producer_plugin/producer_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
auto start = fc::time_point::now();
auto idle_time = start - self->_idle_trx_time;
self->_account_fails.add_idle_time( idle_time );
fc_dlog( _trx_successful_trace_log, "Time since last trx: ${t}us", ("t", idle_time) );
fc_tlog( _log, "Time since last trx: ${t}us", ("t", idle_time) );

auto exception_handler = [self, &next, trx{std::move(trx)}, &start](fc::exception_ptr ex) {
self->_account_fails.add_idle_time( start - self->_idle_trx_time );
Expand Down Expand Up @@ -2052,14 +2052,14 @@ producer_plugin_impl::push_transaction( const fc::time_point& block_deadline,
pr.failed = true;
const fc::exception& e = *trace->except;
if( e.code() != tx_duplicate::code_value ) {
fc_dlog( _trx_failed_trace_log, "Subjective bill for failed ${a}: ${b} elapsed ${t}us, time ${r}us",
fc_tlog( _log, "Subjective bill for failed ${a}: ${b} elapsed ${t}us, time ${r}us",
("a",first_auth)("b",sub_bill)("t",trace->elapsed)("r", end - start));
if (!disable_subjective_enforcement) // subjectively bill failure when producing since not in objective cpu account billing
_subjective_billing.subjective_bill_failure( first_auth, trace->elapsed, fc::time_point::now() );

log_trx_results( trx, trace, start );
// this failed our configured maximum transaction time, we don't want to replay it
fc_dlog( _trx_failed_trace_log, "Failed ${c} trx, auth: ${a}, prev billed: ${p}us, ran: ${r}us, id: ${id}, except: ${e}",
fc_tlog( _log, "Failed ${c} trx, auth: ${a}, prev billed: ${p}us, ran: ${r}us, id: ${id}, except: ${e}",
("c", e.code())("a", first_auth)("p", prev_billed_cpu_time_us)
( "r", end - start)("id", trx->id())("e", e) );
if( !disable_subjective_enforcement )
Expand All @@ -2075,7 +2075,7 @@ producer_plugin_impl::push_transaction( const fc::time_point& block_deadline,
}
}
} else {
fc_dlog( _trx_successful_trace_log, "Subjective bill for success ${a}: ${b} elapsed ${t}us, time ${r}us",
fc_tlog( _log, "Subjective bill for success ${a}: ${b} elapsed ${t}us, time ${r}us",
("a",first_auth)("b",sub_bill)("t",trace->elapsed)("r", end - start));
_account_fails.add_success_time(end - start);
log_trx_results( trx, trace, start );
Expand Down