Split up session_t::reread_journal_files()

You now call session_t::close_journal_files() followed by
session_t::read_journal_files().
This commit is contained in:
John Wiegley 2009-02-15 19:32:15 -04:00
parent 6bfb4206b1
commit 2ec9b6a7b2
3 changed files with 4 additions and 5 deletions

View file

@ -144,7 +144,8 @@ public:
} }
value_t reload_command(call_scope_t& scope) { value_t reload_command(call_scope_t& scope) {
session.reread_journal_files(); session.close_journal_files();
session.read_journal_files();
return true; return true;
} }

View file

@ -165,7 +165,7 @@ void session_t::read_journal_files()
INFO("Found " << count << " entries"); INFO("Found " << count << " entries");
} }
void session_t::reread_journal_files() void session_t::close_journal_files()
{ {
journal.reset(); journal.reset();
master.reset(); master.reset();
@ -176,8 +176,6 @@ void session_t::reread_journal_files()
amount_t::initialize(commodity_pool); amount_t::initialize(commodity_pool);
master.reset(new account_t); master.reset(new account_t);
journal.reset(new journal_t(master.get())); journal.reset(new journal_t(master.get()));
read_journal_files();
} }
void session_t::clean_xacts() void session_t::clean_xacts()

View file

@ -88,7 +88,7 @@ public:
std::size_t read_data(const string& master_account = ""); std::size_t read_data(const string& master_account = "");
void read_journal_files(); void read_journal_files();
void reread_journal_files(); void close_journal_files();
void clean_xacts(); void clean_xacts();
void clean_xacts(entry_t& entry); void clean_xacts(entry_t& entry);