owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not drop all clusters when updating the scan settings

Browse Source
This commit is contained in:
emeric
2018-05-24 20:54:31 +02:00
parent a087f470a7
commit 26d2065180
4 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/ScanSettings.cpp
+4 -8
View File
@@ -80,10 +80,6 @@ ScanSettings::setClusterTypes(const std::set<std::string>& clusterTypeNames)
bool needRescan = false;
assert(session());
// Backup the old list
std::vector<ClusterType::pointer> oldClusterTypes(_clusterTypes.begin(), _clusterTypes.end());
_clusterTypes.clear();
// Create any missing cluster type
for (auto clusterTypeName : clusterTypeNames)
{
@@ -98,13 +94,13 @@ ScanSettings::setClusterTypes(const std::set<std::string>& clusterTypeNames)
}
// Delete no longer existing cluster types
for (auto oldClusterType : oldClusterTypes)
for (auto clusterType : _clusterTypes)
{
if (std::none_of(clusterTypeNames.begin(), clusterTypeNames.end(),
[oldClusterType](const std::string& name) { return name == oldClusterType->getName(); }))
[clusterType](const std::string& name) { return name == clusterType->getName(); }))
{
LMS_LOG(DB, INFO) << "Deleting cluster type " << oldClusterType->getName();
oldClusterType.remove();
LMS_LOG(DB, INFO) << "Deleting cluster type " << clusterType->getName();
clusterType.remove();
needRescan = true;
}
}