0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs: Demote a few BFS-specific error log statements to info level

Browse source 
Some of these don't even exist in the legacy non-BFS implementation, but
it's possible they might prove useful for debugging later.

Fixes some spurious errors printed when browsing directories outside the
user's home dir on Linux/*BSD/etc., as well as a few recently introduced
in the GUI2 test suite by commit
db28dca52c.
This commit is contained in:
Ignacio R. Morelle 2015-04-12 01:59:04 -03:00
parent 8f6d3a1a6d
commit 542b3a2904
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/filesystem_boost.cpp
View file

@ -218,7 +218,7 @@ static bool is_directory_internal(const path &fpath)
error_code ec;
bool is_dir = bfs::is_directory(fpath, ec);
if (error_except_not_found(ec)) {
ERR_FS << "Failed to check if " << fpath.string() << " is a directory: " << ec.message() << '\n';
LOG_FS << "Failed to check if " << fpath.string() << " is a directory: " << ec.message() << '\n';
}
return is_dir;
}
@ -336,7 +336,7 @@ void get_files_in_dir(const std::string &dir,
for(; di != end; ++di) {
bfs::file_status st = di->status(ec);
if (ec) {
ERR_FS << "Failed to get file status of " << di->path().string() << ": " << ec.message() << '\n';
LOG_FS << "Failed to get file status of " << di->path().string() << ": " << ec.message() << '\n';
continue;
}
if (st.type() == bfs::regular_file) {
@ -352,14 +352,14 @@ void get_files_in_dir(const std::string &dir,
if (checksum != NULL) {
std::time_t mtime = bfs::last_write_time(di->path(), ec);
if (ec) {
ERR_FS << "Failed to read modification time of " << di->path().string() << ": " << ec.message() << '\n';
LOG_FS << "Failed to read modification time of " << di->path().string() << ": " << ec.message() << '\n';
} else if (mtime > checksum->modified) {
checksum->modified = mtime;
}
uintmax_t size = bfs::file_size(di->path(), ec);
if (ec) {
ERR_FS << "Failed to read filesize of " << di->path().string() << ": " << ec.message() << '\n';
LOG_FS << "Failed to read filesize of " << di->path().string() << ": " << ec.message() << '\n';
} else {
checksum->sum_size += size;
}
@ -377,7 +377,7 @@ void get_files_in_dir(const std::string &dir,
const path inner_main(di->path() / maincfg_filename);
bfs::file_status main_st = bfs::status(inner_main, ec);
if (error_except_not_found(ec)) {
ERR_FS << "Failed to get file status of " << inner_main.string() << ": " << ec.message() << '\n';
LOG_FS << "Failed to get file status of " << inner_main.string() << ": " << ec.message() << '\n';
} else if (reorder == DO_REORDER && main_st.type() == bfs::regular_file) {
LOG_FS << "_main.cfg found : " << (mode == ENTIRE_FILE_PATH ? inner_main.string() : inner_main.filename().string()) << '\n';
push_if_exists(files, inner_main, mode == ENTIRE_FILE_PATH);
@ -838,7 +838,7 @@ time_t file_modified_time(const std::string& fname)
error_code ec;
std::time_t mtime = bfs::last_write_time(path(fname), ec);
if (ec) {
ERR_FS << "Failed to read modification time of " << fname << ": " << ec.message() << '\n';
LOG_FS << "Failed to read modification time of " << fname << ": " << ec.message() << '\n';
}
return mtime;
}
@ -858,7 +858,7 @@ int file_size(const std::string& fname)
error_code ec;
uintmax_t size = bfs::file_size(path(fname), ec);
if (ec) {
ERR_FS << "Failed to read filesize of " << fname << ": " << ec.message() << '\n';
LOG_FS << "Failed to read filesize of " << fname << ": " << ec.message() << '\n';
return -1;
} else if (size > INT_MAX)
return INT_MAX;
@ -877,7 +877,7 @@ int dir_size(const std::string& pname)
}
}
if (ec) {
ERR_FS << "Failed to read directorysize of " << pname << ": " << ec.message() << '\n';
LOG_FS << "Failed to read directorysize of " << pname << ": " << ec.message() << '\n';
return -1;
}
else if (size_sum > INT_MAX)