hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2200 Store server version string and type in internal class

Browse Source
This commit is contained in:
Esa Korhonen
2018-12-17 18:31:06 +02:00
parent 54ae7119cf
commit d1b098d3b0
3 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/core/internal/server.hh
View File

@ -102,7 +102,17 @@ public:
Version get_version() const override
{
return info.get();
return info.version_num();
}
Type get_type() const override
{
return info.type();
}
std::string get_version_string() const override
{
return info.version_string();
}
/**
@ -244,25 +254,24 @@ private:
class VersionInfo
{
public:
/**
* Read in and decode a numeric version from the server. Deduce server type from string.
* Reads in version data. Deduces server type from version string.
*
* @param version_num Version number from server
* @param version_string Version string from server
*/
void set(uint64_t version_num, const std::string& version_string);
/**
* Get version and type info.
*
* @return Version information
*/
Version get() const;
Version version_num() const;
Type type() const;
std::string version_string() const;
private:
mutable std::mutex m_lock; /**< Protects against concurrent writing */
Version m_version;
server_type_t m_type = SERVER_TYPE_MARIADB;
mutable std::mutex m_lock; /**< Protects against concurrent writing */
Version m_version_num; /**< Numeric version */
Type m_type = Type::MARIADB; /**< Server type */
char m_version_str[MAX_VERSION_LEN] = {'\0'}; /**< Server version string */
};
Settings m_settings; /**< Server settings */
@ -271,6 +280,7 @@ private:
};
void server_free(Server* server);
/**
* @brief Convert a server to JSON format
*