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

Move string_printf to maxbase

Browse Source 
Can be used in tests.
This commit is contained in:
Esa Korhonen
2018-11-08 16:32:13 +02:00
parent dbe9e0c471
commit a1e1ac0012
9 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/monitor/mariadbmon/cluster_discovery.cc
View File

@ -12,16 +12,16 @@
*/
#include "mariadbmon.hh"
#include <algorithm>
#include <inttypes.h>
#include <string>
#include <queue>
#include <maxbase/format.hh>
#include <maxscale/modutil.h>
#include <maxscale/mysql_utils.h>
#include <maxscale/utils.hh>
using std::string;
using maxscale::string_printf;
using maxbase::string_printf;
namespace
{

6
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -12,18 +12,18 @@
*/
#include "mariadbmon.hh"
#include <algorithm>
#include <inttypes.h>
#include <set>
#include <sstream>
#include <maxbase/stopwatch.hh>
#include <maxbase/format.hh>
#include <maxscale/clock.h>
#include <maxscale/mysql_utils.h>
#include <maxscale/utils.hh>
using std::string;
using std::unique_ptr;
using maxscale::string_printf;
using maxbase::string_printf;
using maxbase::StopWatch;
using maxbase::Duration;

6
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -19,18 +19,19 @@
#include <inttypes.h>
#include <sstream>
#include <maxbase/assert.h>
#include <maxbase/format.hh>
#include <maxscale/alloc.h>
#include <maxscale/dcb.h>
#include <maxscale/modulecmd.h>
#include <maxscale/mysql_utils.h>
#include <maxscale/routingworker.h>
#include <maxscale/secrets.h>
#include <maxscale/utils.hh>
#include <maxscale/utils.h>
// TODO: For monitor_add_parameters
#include "../../../core/internal/monitor.h"
using std::string;
using maxscale::string_printf;
using maxbase::string_printf;
// Config parameter names
const char* const CN_AUTO_FAILOVER = "auto_failover";
@ -278,7 +279,6 @@ void MariaDBMonitor::diagnostics(DCB* dcb) const
string MariaDBMonitor::diagnostics_to_string() const
{
using maxscale::string_printf;
string rval;
rval += string_printf("Automatic failover: %s\n", m_auto_failover ? "Enabled" : "Disabled");
rval += string_printf("Failcount: %d\n", m_failcount);

7
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -17,12 +17,13 @@
#include <inttypes.h>
#include <iomanip>
#include <thread>
#include <maxscale/mysql_utils.h>
#include <maxscale/utils.hh>
#include <set>
#include <maxbase/format.hh>
#include <maxscale/mysql_utils.h>
using std::string;
using maxscale::string_printf;
using maxbase::string_printf;
using maxbase::Duration;
using maxbase::StopWatch;

5
server/modules/monitor/mariadbmon/server_utils.cc
View File

@ -14,11 +14,12 @@
#include <algorithm>
#include <inttypes.h>
#include <maxbase/format.hh>
#include <maxbase/assert.h>
#include <maxscale/utils.hh>
using std::string;
using maxscale::string_printf;
using maxbase::string_printf;
namespace
{