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

Merge branch '2.3.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-30 12:05:29 +02:00
parent 95d8ee9305 1126c687a4
commit 6f934cb9d4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/filter.cc
View File

@ -256,10 +256,10 @@ void dprintAllFilters(DCB* dcb)
* Designed to be called within a debug CLI in order * Designed to be called within a debug CLI in order
* to display all active filters in MaxScale * to display all active filters in MaxScale
*/ */
void dprintFilter(DCB* dcb, const SFilterDef& filter) void dprintFilter(DCB* dcb, const FilterDef* filter)
{ {
mxb_assert(filter); mxb_assert(filter);
dcb_printf(dcb, "FilterDef %p (%s)\n", filter.get(), filter->name.c_str()); dcb_printf(dcb, "FilterDef %p (%s)\n", filter, filter->name.c_str());
dcb_printf(dcb, "\tModule: %s\n", filter->module.c_str()); dcb_printf(dcb, "\tModule: %s\n", filter->module.c_str());
if (filter->obj && filter->filter) if (filter->obj && filter->filter)
{ {

2
server/core/internal/filter.hh
View File

@ -93,7 +93,7 @@ void filter_destroy_instances();
bool filter_serialize(const SFilterDef& filter); bool filter_serialize(const SFilterDef& filter);
void dprintAllFilters(DCB*); void dprintAllFilters(DCB*);
void dprintFilter(DCB*, const SFilterDef&); void dprintFilter(DCB*, const FilterDef*);
void dListFilters(DCB*); void dListFilters(DCB*);
/** /**

2
server/core/query_classifier.cc
View File

@ -26,6 +26,8 @@
#include <maxscale/modutil.hh> #include <maxscale/modutil.hh>
#include <maxscale/pcre2.h> #include <maxscale/pcre2.h>
#include <maxscale/utils.h> #include <maxscale/utils.h>
#include <maxscale/jansson.hh>
#include <maxscale/buffer.hh>
#include "internal/config_runtime.h" #include "internal/config_runtime.h"
#include "internal/modules.h" #include "internal/modules.h"