Mercurial > hg > orthanc-databases
annotate Framework/MySQL/MySQLParameters.cpp @ 141:0b3e9ee53c46
Added 'MaximumConnectionRetries' & 'ConnectionRetryInterval' to configure the retries when connecting to the DB at startup
| author | Alain Mazy <alain@mazy.be> |
|---|---|
| date | Mon, 03 Feb 2020 22:29:51 +0100 |
| parents | 4cd7e45b671e |
| children | 063aa53b5917 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
140
4cd7e45b671e
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "MySQLParameters.h" | |
| 23 | |
| 61 | 24 #include "MySQLDatabase.h" |
| 25 | |
| 0 | 26 #include <Core/Logging.h> |
| 27 #include <Core/OrthancException.h> | |
| 28 | |
| 29 namespace OrthancDatabases | |
| 30 { | |
| 31 void MySQLParameters::Reset() | |
| 32 { | |
| 33 host_ = "localhost"; | |
| 34 username_.clear(); | |
| 35 password_.clear(); | |
| 36 database_.clear(); | |
| 37 port_ = 3306; | |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
38 |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
39 #if defined(_WIN32) |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
40 unixSocket_.clear(); |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
41 #else |
| 0 | 42 unixSocket_ = "/var/run/mysqld/mysqld.sock"; |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
43 #endif |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
44 |
| 0 | 45 lock_ = true; |
| 46 } | |
| 47 | |
| 48 | |
| 49 MySQLParameters::MySQLParameters() | |
| 50 { | |
| 51 Reset(); | |
| 52 } | |
| 53 | |
| 54 | |
| 55 MySQLParameters::MySQLParameters(const OrthancPlugins::OrthancConfiguration& configuration) | |
| 56 { | |
| 57 Reset(); | |
| 58 | |
| 59 std::string s; | |
| 60 if (configuration.LookupStringValue(s, "Host")) | |
| 61 { | |
| 62 SetHost(s); | |
| 63 } | |
| 64 | |
| 65 if (configuration.LookupStringValue(s, "Username")) | |
| 66 { | |
| 67 SetUsername(s); | |
| 68 } | |
| 69 | |
| 70 if (configuration.LookupStringValue(s, "Password")) | |
| 71 { | |
| 72 SetPassword(s); | |
| 73 } | |
| 74 | |
| 75 if (configuration.LookupStringValue(s, "Database")) | |
| 76 { | |
| 77 SetDatabase(s); | |
| 78 } | |
| 79 | |
| 80 unsigned int port; | |
| 81 if (configuration.LookupUnsignedIntegerValue(port, "Port")) | |
| 82 { | |
| 83 SetPort(port); | |
| 84 } | |
| 85 | |
| 86 if (configuration.LookupStringValue(s, "UnixSocket")) | |
| 87 { | |
| 88 SetUnixSocket(s); | |
| 89 } | |
| 90 | |
| 91 lock_ = configuration.GetBooleanValue("Lock", true); // Use locking by default | |
|
141
0b3e9ee53c46
Added 'MaximumConnectionRetries' & 'ConnectionRetryInterval' to configure the retries when connecting to the DB at startup
Alain Mazy <alain@mazy.be>
parents:
140
diff
changeset
|
92 |
|
0b3e9ee53c46
Added 'MaximumConnectionRetries' & 'ConnectionRetryInterval' to configure the retries when connecting to the DB at startup
Alain Mazy <alain@mazy.be>
parents:
140
diff
changeset
|
93 maxConnectionRetries_ = configuration.GetUnsignedIntegerValue("MaximumConnectionRetries", 10); |
|
0b3e9ee53c46
Added 'MaximumConnectionRetries' & 'ConnectionRetryInterval' to configure the retries when connecting to the DB at startup
Alain Mazy <alain@mazy.be>
parents:
140
diff
changeset
|
94 connectionRetryInterval_ = configuration.GetUnsignedIntegerValue("ConnectionRetryInterval", 5); |
| 0 | 95 } |
| 96 | |
| 97 | |
| 98 void MySQLParameters::SetHost(const std::string& host) | |
| 99 { | |
| 100 host_ = host; | |
| 101 } | |
| 102 | |
| 103 | |
| 104 void MySQLParameters::SetUsername(const std::string& username) | |
| 105 { | |
| 106 username_ = username; | |
| 107 } | |
| 108 | |
| 109 | |
| 110 void MySQLParameters::SetPassword(const std::string& password) | |
| 111 { | |
| 112 password_ = password; | |
| 113 } | |
| 114 | |
| 115 | |
| 116 void MySQLParameters::SetDatabase(const std::string& database) | |
| 117 { | |
|
23
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
118 if (database.empty()) |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
119 { |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
120 LOG(ERROR) << "MySQL: Empty database name"; |
|
23
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
121 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
122 } |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
123 |
| 61 | 124 if (!MySQLDatabase::IsValidDatabaseIdentifier(database)) |
|
23
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
125 { |
| 61 | 126 LOG(ERROR) << "MySQL: Only alphanumeric characters are allowed in a " |
| 127 << "database name: \"" << database << "\""; | |
| 128 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
|
23
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
129 } |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
130 |
| 0 | 131 database_ = database; |
| 132 } | |
| 133 | |
| 134 | |
| 135 void MySQLParameters::SetPort(unsigned int port) | |
| 136 { | |
| 137 if (port >= 65535) | |
| 138 { | |
| 139 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 140 } | |
| 141 else | |
| 142 { | |
| 143 port_ = port; | |
| 144 } | |
| 145 } | |
| 146 | |
| 147 | |
| 148 void MySQLParameters::SetUnixSocket(const std::string& socket) | |
| 149 { | |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
150 #if defined(_WIN32) |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
151 if (!socket.empty()) |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
152 { |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
153 LOG(WARNING) << "MySQL: Setting an UNIX socket on Windows has no effect"; |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
154 } |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
155 #endif |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
156 |
| 0 | 157 unixSocket_ = socket; |
| 158 } | |
|
22
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
159 |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
160 |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
161 void MySQLParameters::Format(Json::Value& target) const |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
162 { |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
163 target = Json::objectValue; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
164 target["Host"] = host_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
165 target["Username"] = username_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
166 target["Password"] = password_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
167 target["Database"] = database_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
168 target["Port"] = port_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
169 target["UnixSocket"] = unixSocket_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
170 target["Lock"] = lock_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
171 } |
| 0 | 172 } |