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

Log console output during replay to file #985 #76

Merged
merged 2 commits into from
Oct 1, 2018
Merged

Log console output during replay to file #985 #76

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c544b38
Log console output during replay to file #985
cogutvalera Sep 21, 2018
fa7faee
fc::create_directories before rotate_files
cogutvalera Sep 24, 2018
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
36 changes: 17 additions & 19 deletions src/log/file_appender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,25 @@ namespace fc {
public:
impl( const config& c) : cfg( c )
{
if( cfg.rotate )
{
FC_ASSERT( cfg.rotation_interval >= seconds( 1 ) );
FC_ASSERT( cfg.rotation_limit >= cfg.rotation_interval );

if( cfg.rotate )
{
FC_ASSERT( cfg.rotation_interval >= seconds( 1 ) );
FC_ASSERT( cfg.rotation_limit >= cfg.rotation_interval );

rotate_files( true );
}

try
{
fc::create_directories(cfg.filename.parent_path());
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

create_directories should happen before rotate_files.


_rotation_task = fc::async( [this]() { rotate_files( true ); }, "rotate_files(1)" );
}
if(!cfg.rotate)
out.open( cfg.filename, std::ios_base::out | std::ios_base::app);
}
catch( ... )
{
std::cerr << "error opening log file: " << cfg.filename.preferred_string() << "\n";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the appender usable after caught an exception here? What will happen when trying to write?

}
}

~impl()
Expand Down Expand Up @@ -137,18 +146,7 @@ namespace fc {
file_appender::file_appender( const variant& args ) :
my( new impl( args.as<config>( FC_MAX_LOG_OBJECT_DEPTH ) ) )
{
try
{
fc::create_directories(my->cfg.filename.parent_path());
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this must be moved to impl::impl(), not simply removed.


if(!my->cfg.rotate)
Copy link

@jmjatlanta jmjatlanta Sep 17, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't walked all of the code, but if rotate == true, will removing this cause open() to be called twice (once here, and once in rotate_files()) ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if rotate check was removed, and twice won't be open because there is a check in open_log_filename method

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...and this shouldn't be removed.

my->out.open( my->cfg.filename, std::ios_base::out | std::ios_base::app);

}
catch( ... )
{
std::cerr << "error opening log file: " << my->cfg.filename.preferred_string() << "\n";
}

}

file_appender::~file_appender(){}
Expand Down