Merge branch '2.1' into develop

2017-07-06 11:25:36 +03:00
parent c6b579619a 66048cf094
commit ef73f3e217
11 changed files with 210 additions and 2 deletions
--- a/server/modules/routing/schemarouter/schemarouter.hh
+++ b/server/modules/routing/schemarouter/schemarouter.hh
@ -46,13 +46,15 @@ struct Config
    pcre2_code*       ignore_regex;         /**< Regular expression used to ignore databases */
    pcre2_match_data* ignore_match_data;    /**< Match data for @c ignore_regex */
    std::set<std::string> ignored_dbs;      /**< Set of ignored databases */
+    SERVER*           preferred_server;     /**< Server to prefer in conflict situations */

    Config():
        refresh_min_interval(0.0),
        refresh_databases(false),
        debug(false),
        ignore_regex(NULL),
-        ignore_match_data(NULL)
+        ignore_match_data(NULL),
+        preferred_server(NULL)
    {
    }
 };