diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 76636a0b18fcbfc77cafc48c8eb1466258e2e214..eb9b22ce02938990ad439ad2138ef101f886a895 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -31,6 +31,7 @@ - cta/CTA#575 - Remove rados metrics logging - cta/CTA#675 - Renaming PostgresSchedDB to RelationalDB and introducing rdbms directory model to the Scheduler DB code - cta/CTA#687 - Remove SyslogLogger +- cta/CTA#459 - Remove function name from UserError exception messages # v4.10.10.1-1 / v5.10.10.1-1 diff --git a/catalogue/rdbms/RdbmsVirtualOrganizationCatalogue.cpp b/catalogue/rdbms/RdbmsVirtualOrganizationCatalogue.cpp index adf65d43fdd59f536b6e4d50c1a37dd09b623095..0134f9ccc3d092064a460d1337023346bca47d3d 100644 --- a/catalogue/rdbms/RdbmsVirtualOrganizationCatalogue.cpp +++ b/catalogue/rdbms/RdbmsVirtualOrganizationCatalogue.cpp @@ -327,7 +327,7 @@ std::optional<common::dataStructures::VirtualOrganization> RdbmsVirtualOrganizat virtualOrganization.isRepackVo = rset.columnOptionalBool("IS_REPACK_VO").value_or(false); if(rset.next()){ - throw exception::UserError("In RdbmsCatalogue::getDefaultVirtualOrganizationForRepack() found more that one default Virtual Organization for repack."); + throw exception::UserError("Found more that one default Virtual Organization for repack."); } return virtualOrganization; diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp index eca469ba1e3508cdf8bedfe2b663928e40e19607..61a43666199edbf5b73b5d290d98fc6c93227fff 100644 --- a/scheduler/OStoreDB/OStoreDB.cpp +++ b/scheduler/OStoreDB/OStoreDB.cpp @@ -2030,7 +2030,7 @@ common::dataStructures::RepackInfo OStoreDB::getRepackInfo(const std::string& vi try { ri.setAddress(re.getRepackIndexAddress()); } catch (cta::exception::Exception& ) { - throw exception::UserError("In OStoreDB::getRepackInfo(): No repack request for this VID (index not present)."); + throw exception::UserError("No repack request for this VID (index not present)."); } ri.fetchNoLock(); auto rrAddresses = ri.getRepackRequestsAddresses(); @@ -2045,7 +2045,7 @@ common::dataStructures::RepackInfo OStoreDB::getRepackInfo(const std::string& vi } catch (cta::exception::Exception& ) {} } } - throw exception::UserError("In OStoreDB::getRepackInfo(): No repack request for this VID."); + throw exception::UserError("No repack request for this VID."); } //------------------------------------------------------------------------------ @@ -3362,7 +3362,7 @@ void OStoreDB::cancelRepack(const std::string& vid, log::LogContext& lc) { try { ri.setAddress(re.getRepackIndexAddress()); } catch (cta::exception::Exception& ) { - throw exception::UserError("In OStoreDB::cancelRepack(): No repack request for this VID (index not present)."); + throw exception::UserError("No repack request for this VID (index not present)."); } ri.fetchNoLock(); auto rrAddresses = ri.getRepackRequestsAddresses(); @@ -3415,7 +3415,7 @@ void OStoreDB::cancelRepack(const std::string& vid, log::LogContext& lc) { } } } - throw exception::UserError("In OStoreDB::cancelRepack(): No repack request for this VID."); + throw exception::UserError("No repack request for this VID."); } //------------------------------------------------------------------------------