Skip to content

Commit c6e4af9

Browse files
committed
Handle disconnecting from databases internally
Now also CCDB (not only MySQL) disconnects from database during destruction and handling it manually is no longer required.
1 parent 03a4c6d commit c6e4af9

4 files changed

Lines changed: 6 additions & 3 deletions

File tree

Framework/include/QualityControl/CcdbDatabase.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class CcdbDatabase : public DatabaseInterface
5353
{
5454
public:
5555
CcdbDatabase();
56+
~CcdbDatabase();
5657

5758
void connect(std::string host, std::string database, std::string username, std::string password) override;
5859
void connect(std::unique_ptr<ConfigurationInterface> &config) override;

Framework/src/CcdbDatabase.cxx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ using namespace std;
3636
CcdbDatabase::CcdbDatabase() : mUrl("")
3737
{}
3838

39+
CcdbDatabase::~CcdbDatabase()
40+
{
41+
disconnect();
42+
}
43+
3944
void CcdbDatabase::curlInit()
4045
{
4146
curl_global_init(CURL_GLOBAL_DEFAULT);

Framework/src/Checker.cxx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ void Checker::createChannel(std::string type, std::string method, std::string ad
124124

125125
Checker::~Checker()
126126
{
127-
mDatabase->disconnect();
128-
129127
// Monitoring
130128
std::chrono::duration<double> diff = endLastObject - startFirstObject;
131129
mCollector->send({diff.count(), "QC_checker_Time_between_first_and_last_objects_received"});

Framework/src/ClientDataProvider.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ClientDataProvider::ClientDataProvider()
2222

2323
ClientDataProvider::~ClientDataProvider()
2424
{
25-
database->disconnect();
2625
}
2726

2827
TObject* ClientDataProvider::getObject(std::string taskName, std::string objectName)

0 commit comments

Comments
 (0)