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.1 -> main] Fix log trimming of hex_data JSON output. #549

Merged
merged 4 commits into from
Jun 28, 2022
Merged

[3.1 -> main] Fix log trimming of hex_data JSON output. #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c10e77
GH-538 Add transaction_trace_success and transaction_trace_failure tr…
heifner Jun 25, 2022
e974add
GH-538 Use hex trimming logic for logging of hex_data json value.
heifner Jun 25, 2022
8ecae67
Merge pull request #539 from eosnetworkfoundation/GH-538-fix-hex-trim…
heifner Jun 28, 2022
007e14c
Merge remote-tracking branch 'origin/release/3.1.x' into GH-538-fix-h…
heifner Jun 28, 2022
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
2 changes: 1 addition & 1 deletion libraries/chain/include/eosio/chain/abi_serializer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ namespace impl {
binary_to_variant_context _ctx(*abi, ctx, type);
_ctx.short_path = true; // Just to be safe while avoiding the complexity of threading an override boolean all over the place
mvo( "data", abi->_binary_to_variant( type, act.data, _ctx ));
mvo("hex_data", act.data);
set_hex_data(mvo, "hex_data", act.data);
} catch(...) {
// any failure to serialize data, then leave as not serailzed
set_hex_data(mvo, "data", act.data);
Expand Down
12 changes: 12 additions & 0 deletions programs/eosio-launcher/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,18 @@ launcher_def::write_logging_config_file(tn_node_def &node) {
if( gelf_enabled ) tft.appenders.push_back( "net" );
log_config.loggers.emplace_back( tft );

fc::logger_config tts( "transaction_trace_success" );
tts.level = fc::log_level::debug;
tts.appenders.push_back( "stderr" );
if( gelf_enabled ) tts.appenders.push_back( "net" );
log_config.loggers.emplace_back( tts );

fc::logger_config ttf( "transaction_trace_failure" );
ttf.level = fc::log_level::debug;
ttf.appenders.push_back( "stderr" );
if( gelf_enabled ) ttf.appenders.push_back( "net" );
log_config.loggers.emplace_back( ttf );

fc::logger_config ta( "trace_api" );
ta.level = fc::log_level::debug;
ta.appenders.push_back( "stderr" );
Expand Down