Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +3 -5
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a1d84f22c0 - Show all commits

2
include/fc/log/file_appender.hpp
View file

@ -18,7 +18,7 @@ class file_appender : public appender {
bool rotate = false; bool rotate = false;
microseconds rotation_interval; microseconds rotation_interval;
microseconds rotation_limit; microseconds rotation_limit;
uint32_t max_object_depth; uint32_t max_object_depth = FC_MAX_LOG_OBJECT_DEPTH;
}; };
file_appender( const variant& args ); file_appender( const variant& args );
~file_appender(); ~file_appender();

2
include/fc/log/gelf_appender.hpp
View file

@ -15,7 +15,7 @@ namespace fc
{ {
string endpoint = "127.0.0.1:12201"; string endpoint = "127.0.0.1:12201";
string host = "fc"; // the name of the host, source or application that sent this message (just passed through to GELF server) string host = "fc"; // the name of the host, source or application that sent this message (just passed through to GELF server)
uint32_t max_object_depth; uint32_t max_object_depth = FC_MAX_LOG_OBJECT_DEPTH;
}; };
gelf_appender(const variant& args); gelf_appender(const variant& args);

4
src/log/file_appender.cpp
View file

@ -144,9 +144,7 @@ namespace fc {
file_appender::file_appender( const variant& args ) : file_appender::file_appender( const variant& args ) :
my( new impl( args.as<config>( FC_MAX_LOG_OBJECT_DEPTH ) ) ) my( new impl( args.as<config>( FC_MAX_LOG_OBJECT_DEPTH ) ) )
{ {}
}
file_appender::~file_appender(){} file_appender::~file_appender(){}