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

MXS-2220 Move MxsDiskSpaceThreshold definition to SERVER

Browse Source 
Reduces include-clutter a bit.
This commit is contained in:
Esa Korhonen
2018-12-12 14:18:35 +02:00
parent 6209d737e9
commit 405b4de1dd
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/maxscale/config.hh
View File

@ -20,9 +20,6 @@
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
// A mapping from a path to a percentage, e.g.: "/disk" -> 80.
typedef std::unordered_map<std::string, int32_t> MxsDiskSpaceThreshold;
#include <limits.h> #include <limits.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <sys/utsname.h> #include <sys/utsname.h>
@ -32,6 +29,7 @@ typedef std::unordered_map<std::string, int32_t> MxsDiskSpaceThreshold;
#include <maxscale/modinfo.h> #include <maxscale/modinfo.h>
#include <maxscale/pcre2.h> #include <maxscale/pcre2.h>
#include <maxscale/query_classifier.h> #include <maxscale/query_classifier.h>
#include <maxscale/server.hh>
class SERVICE; class SERVICE;

10
include/maxscale/server.hh
View File

@ -15,9 +15,11 @@
#include <maxscale/ccdefs.hh> #include <maxscale/ccdefs.hh>
#include <string> #include <string>
#include <maxbase/jansson.h> #include <maxscale/ssl.h>
#include <maxscale/config.hh> #include <unordered_map>
#include <maxscale/dcb.hh>
// A mapping from a path to a percentage, e.g.: "/disk" -> 80.
typedef std::unordered_map<std::string, int32_t> MxsDiskSpaceThreshold;
/** /**
* Server configuration parameters names * Server configuration parameters names
@ -37,6 +39,8 @@ const int MAINTENANCE_ON = 100;
const int MAINTENANCE_FLAG_NOCHECK = 0; const int MAINTENANCE_FLAG_NOCHECK = 0;
const int MAINTENANCE_FLAG_CHECK = -1; const int MAINTENANCE_FLAG_CHECK = -1;
struct DCB;
/* Custom server parameters. These can be used by modules for e.g. weighting routing decisions. */ /* Custom server parameters. These can be used by modules for e.g. weighting routing decisions. */
struct SERVER_PARAM struct SERVER_PARAM
{ {

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

@ -19,11 +19,10 @@
#include <maxbase/ccdefs.hh> #include <maxbase/ccdefs.hh>
#include <mutex> #include <mutex>
#include <maxbase/average.hh> #include <maxbase/average.hh>
#include <maxscale/config.hh>
#include <maxscale/server.hh> #include <maxscale/server.hh>
#include <maxscale/resultset.hh> #include <maxscale/resultset.hh>
#include <maxscale/routingworker.hh>
std::unique_ptr<ResultSet> serverGetList(); std::unique_ptr<ResultSet> serverGetList();

2
server/modules/filter/masking/maskingrules.hh
View File

@ -20,7 +20,7 @@
#include <maxbase/jansson.h> #include <maxbase/jansson.h>
#include <maxscale/pcre2.h> #include <maxscale/pcre2.h>
#include <maxscale/queryclassifier.hh>
#include "mysql.hh" #include "mysql.hh"
/** /**