GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 9ecc7af41f into merged_master (Bitcoin PR bitcoin/bitcoin#31674)

Browse source
This commit is contained in:
ivanlele 2026-04-14 08:26:34 +00:00
commit aaaedd07d4
No known key found for this signature in database
6 changed files with 46 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/init.cpp
View file

@ -1156,19 +1156,23 @@ bool AppInitParameterInteraction(const ArgsManager& args)
return true;
}
static bool LockDataDirectory(bool probeOnly)
static bool LockDirectory(const fs::path& dir, bool probeOnly)
{
// Make sure only a single Bitcoin process is using the data directory.
const fs::path& datadir = gArgs.GetDataDirNet();
switch (util::LockDirectory(datadir, ".lock", probeOnly)) {
// Make sure only a single process is using the directory.
switch (util::LockDirectory(dir, ".lock", probeOnly)) {
case util::LockResult::ErrorWrite:
return InitError(strprintf(_("Cannot write to data directory '%s'; check permissions."), fs::PathToString(datadir)));
return InitError(strprintf(_("Cannot write to directory '%s'; check permissions."), fs::PathToString(dir)));
case util::LockResult::ErrorLock:
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running."), fs::PathToString(datadir), CLIENT_NAME));
return InitError(strprintf(_("Cannot obtain a lock on directory %s. %s is probably already running."), fs::PathToString(dir), CLIENT_NAME));
case util::LockResult::Success: return true;
} // no default case, so the compiler can warn about missing cases
assert(false);
}
static bool LockDirectories(bool probeOnly)
{
return LockDirectory(gArgs.GetDataDirNet(), probeOnly) && \
LockDirectory(gArgs.GetBlocksDirPath(), probeOnly);
}
bool AppInitSanityChecks(const kernel::Context& kernel)
{
@ -1183,19 +1187,19 @@ bool AppInitSanityChecks(const kernel::Context& kernel)
return InitError(strprintf(_("Elliptic curve cryptography sanity check failure. %s is shutting down."), CLIENT_NAME));
}
// Probe the data directory lock to give an early error message, if possible
// We cannot hold the data directory lock here, as the forking for daemon() hasn't yet happened,
// and a fork will cause weird behavior to it.
return LockDataDirectory(true);
// Probe the directory locks to give an early error message, if possible
// We cannot hold the directory locks here, as the forking for daemon() hasn't yet happened,
// and a fork will cause weird behavior to them.
return LockDirectories(true);
}
bool AppInitLockDataDirectory()
bool AppInitLockDirectories()
{
// After daemonization get the data directory lock again and hold on to it until exit
// After daemonization get the directory locks again and hold on to them until exit
// This creates a slight window for a race condition to happen, however this condition is harmless: it
// will at most make us exit without printing a message to console.
if (!LockDataDirectory(false)) {
// Detailed error printed inside LockDataDirectory
if (!LockDirectories(false)) {
// Detailed error printed inside LockDirectory
return false;
}
return true;