Merge #9895: Turn TryCreateDirectory() into TryCreateDirectories()
1d1ea9f
Turn TryCreateDirectory() into TryCreateDirectories() (Marko Bencun)
Tree-SHA512: 49a524167bcf66e351a964c88d09cb3bcee12769a32da83410e3ba649fa4bcdbf0478d41e4d09bb55adb9b3f122e742271db6feb30bbafe2a7973542b5f10f79
This commit is contained in:
commit
228c319a94
6 changed files with 8 additions and 10 deletions
|
@ -108,7 +108,7 @@ CDBWrapper::CDBWrapper(const fs::path& path, size_t nCacheSize, bool fMemory, bo
|
|||
leveldb::Status result = leveldb::DestroyDB(path.string(), options);
|
||||
dbwrapper_private::HandleError(result);
|
||||
}
|
||||
TryCreateDirectory(path);
|
||||
TryCreateDirectories(path);
|
||||
LogPrintf("Opening LevelDB in %s\n", path.string());
|
||||
}
|
||||
leveldb::Status status = leveldb::DB::Open(options, path.string(), &pdb);
|
||||
|
|
|
@ -1408,8 +1408,6 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
|
|||
fReindex = GetBoolArg("-reindex", false);
|
||||
bool fReindexChainState = GetBoolArg("-reindex-chainstate", false);
|
||||
|
||||
fs::create_directories(GetDataDir() / "blocks");
|
||||
|
||||
// cache size calculations
|
||||
int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
|
||||
nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
|
||||
|
|
|
@ -214,7 +214,7 @@ bool Intro::pickDataDirectory()
|
|||
}
|
||||
dataDir = intro.getDataDirectory();
|
||||
try {
|
||||
TryCreateDirectory(GUIUtil::qstringToBoostPath(dataDir));
|
||||
TryCreateDirectories(GUIUtil::qstringToBoostPath(dataDir));
|
||||
break;
|
||||
} catch (const fs::filesystem_error&) {
|
||||
QMessageBox::critical(0, tr(PACKAGE_NAME),
|
||||
|
|
|
@ -651,21 +651,21 @@ bool RenameOver(fs::path src, fs::path dest)
|
|||
}
|
||||
|
||||
/**
|
||||
* Ignores exceptions thrown by Boost's create_directory if the requested directory exists.
|
||||
* Ignores exceptions thrown by Boost's create_directories if the requested directory exists.
|
||||
* Specifically handles case where path p exists, but it wasn't possible for the user to
|
||||
* write to the parent directory.
|
||||
*/
|
||||
bool TryCreateDirectory(const fs::path& p)
|
||||
bool TryCreateDirectories(const fs::path& p)
|
||||
{
|
||||
try
|
||||
{
|
||||
return fs::create_directory(p);
|
||||
return fs::create_directories(p);
|
||||
} catch (const fs::filesystem_error&) {
|
||||
if (!fs::exists(p) || !fs::is_directory(p))
|
||||
throw;
|
||||
}
|
||||
|
||||
// create_directory didn't create the directory, it had to have existed already
|
||||
// create_directories didn't create the directory, it had to have existed already
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -152,7 +152,7 @@ bool TruncateFile(FILE *file, unsigned int length);
|
|||
int RaiseFileDescriptorLimit(int nMinFD);
|
||||
void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length);
|
||||
bool RenameOver(fs::path src, fs::path dest);
|
||||
bool TryCreateDirectory(const fs::path& p);
|
||||
bool TryCreateDirectories(const fs::path& p);
|
||||
fs::path GetDefaultDataDir();
|
||||
const fs::path &GetDataDir(bool fNetSpecific = true);
|
||||
void ClearDatadirCache();
|
||||
|
|
|
@ -74,7 +74,7 @@ bool CDBEnv::Open(const fs::path& pathIn)
|
|||
|
||||
strPath = pathIn.string();
|
||||
fs::path pathLogDir = pathIn / "database";
|
||||
TryCreateDirectory(pathLogDir);
|
||||
TryCreateDirectories(pathLogDir);
|
||||
fs::path pathErrorFile = pathIn / "db.log";
|
||||
LogPrintf("CDBEnv::Open: LogDir=%s ErrorFile=%s\n", pathLogDir.string(), pathErrorFile.string());
|
||||
|
||||
|
|
Loading…
Reference in a new issue