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

Merge branch 'master' of github.com:BitShares/fc

Browse source
This commit is contained in:
Daniel Larimer 2015-03-26 16:51:15 -04:00
commit 41fedc14f3
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,12 +14,11 @@ class file_appender : public appender {
fc::string format; fc::string format;
fc::path filename; fc::path filename;
bool flush; bool flush = true;
bool truncate; bool rotate = false;
bool rotate;
microseconds rotation_interval; microseconds rotation_interval;
microseconds rotation_limit; microseconds rotation_limit;
bool rotation_compression; bool rotation_compression = false;
}; };
file_appender( const variant& args ); file_appender( const variant& args );
~file_appender(); ~file_appender();
@ -33,4 +32,4 @@ class file_appender : public appender {
#include <fc/reflect/reflect.hpp> #include <fc/reflect/reflect.hpp>
FC_REFLECT( fc::file_appender::config, FC_REFLECT( fc::file_appender::config,
(format)(filename)(flush)(truncate)(rotate)(rotation_interval)(rotation_limit)(rotation_compression) ) (format)(filename)(flush)(rotate)(rotation_interval)(rotation_limit)(rotation_compression) )

5
src/log/file_appender.cpp
View file

@ -107,8 +107,8 @@ namespace fc {
} }
remove_all(link_filename); // on windows, you can't delete the link while the underlying file is opened for writing remove_all(link_filename); // on windows, you can't delete the link while the underlying file is opened for writing
out.open( log_filename ); out.open( log_filename );
create_hard_link(log_filename, link_filename);
} }
create_hard_link(log_filename, link_filename);
/* Delete old log files */ /* Delete old log files */
fc::time_point limit_time = now - cfg.rotation_limit; fc::time_point limit_time = now - cfg.rotation_limit;
@ -160,9 +160,8 @@ namespace fc {
format( "${timestamp} ${thread_name} ${context} ${file}:${line} ${method} ${level}] ${message}" ), format( "${timestamp} ${thread_name} ${context} ${file}:${line} ${method} ${level}] ${message}" ),
filename(p), filename(p),
flush(true), flush(true),
truncate(true),
rotate(false), rotate(false),
rotation_compression(true) rotation_compression(false)
{} {}
file_appender::file_appender( const variant& args ) : file_appender::file_appender( const variant& args ) :