Merge pull request #539 from eosnetworkfoundation/GH-538-fix-hex-trim…

…-3.1 [3.1] Fix log trimming of hex_data JSON output.
eosnetworkfoundation · Jun 28, 2022 · 8ecae67 · 8ecae67
2 parents 96003fc + e974add
commit 8ecae67
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/libraries/chain/include/eosio/chain/abi_serializer.hpp b/libraries/chain/include/eosio/chain/abi_serializer.hpp
@@ -475,7 +475,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);

diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
@@ -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" );