Merge branch 'develop' for release 3.10.1
This commit is contained in:
@@ -63,6 +63,15 @@ Image::load(const std::vector<unsigned char>& rawData)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
catch (Magick::WarningCoder& e)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Magick::Warning& e)
|
||||||
|
{
|
||||||
|
LMS_LOG(COVER, WARNING) << "Caught Magick warning while loading raw image: " << e.what();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
catch (Magick::Exception& e)
|
catch (Magick::Exception& e)
|
||||||
{
|
{
|
||||||
LMS_LOG(COVER, ERROR) << "Caught Magick exception while loading raw image: " << e.what();
|
LMS_LOG(COVER, ERROR) << "Caught Magick exception while loading raw image: " << e.what();
|
||||||
@@ -79,6 +88,15 @@ Image::load(const std::filesystem::path& p)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
catch (Magick::WarningCoder& e)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Magick::Warning& e)
|
||||||
|
{
|
||||||
|
LMS_LOG(COVER, WARNING) << "Caught Magick warning while loading raw image: " << e.what();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
catch (Magick::Exception& e)
|
catch (Magick::Exception& e)
|
||||||
{
|
{
|
||||||
LMS_LOG(COVER, ERROR) << "Caught Magick exception while loading image from file '" << p.string() << "': " << e.what();
|
LMS_LOG(COVER, ERROR) << "Caught Magick exception while loading image from file '" << p.string() << "': " << e.what();
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ Db::Db(const std::filesystem::path& dbPath)
|
|||||||
|
|
||||||
std::unique_ptr<Wt::Dbo::backend::Sqlite3> connection {std::make_unique<Wt::Dbo::backend::Sqlite3>(dbPath.string())};
|
std::unique_ptr<Wt::Dbo::backend::Sqlite3> connection {std::make_unique<Wt::Dbo::backend::Sqlite3>(dbPath.string())};
|
||||||
connection->executeSql("pragma journal_mode=WAL");
|
connection->executeSql("pragma journal_mode=WAL");
|
||||||
|
connection->executeSql("pragma synchronous=normal");
|
||||||
// connection->setProperty("show-queries", "true");
|
// connection->setProperty("show-queries", "true");
|
||||||
|
|
||||||
auto connectionPool = std::make_unique<Wt::Dbo::FixedSqlConnectionPool>(std::move(connection), 10);
|
auto connectionPool = std::make_unique<Wt::Dbo::FixedSqlConnectionPool>(std::move(connection), 10);
|
||||||
|
|||||||
Reference in New Issue
Block a user