MINOR: config: shm-stats-file is no longer experimental

As confirmed by Aurélien, there isn't any point in keeping this feature
in experimental status, it's now stable.

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 34ac0c805767c30e9636ae44ac56af9c30aa4d1b..2585c8505e0ab2f325e24dec4d786ed7fa8cb01f 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -3329,7 +3329,7 @@ setenv <name> <value>
   the configuration file sees the new value. See also "presetenv", "resetenv",
   and "unsetenv".
 
-shm-stats-file <name> [ EXPERIMENTAL ]
+shm-stats-file <name>
   When this directive is set, it enables the use of shared memory for storing
   stats counters. <name> is used as argument to shm_open() to open the shared
   memory at a unique location. It also means that the directive is only
@@ -3345,7 +3345,7 @@ shm-stats-file <name> [ EXPERIMENTAL ]
 
   See also "guid", "guid-prefix" and "shm-stats-file-max-objects"
 
-shm-stats-file-max-objects <number> [ EXPERIMENTAL ]
+shm-stats-file-max-objects <number>
   This setting defines the maximum number of objects the shared memory used
   for shared counters will be able to store per thread group. It is directly
   related to the maximum memory size of the shm and is used to "premap" the

diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index 882387c2cad7be37fbcf338a5c91c558e8bd36d1..e10117c00578fdf5f2c5e6c65816d98db7e6933a 100644 (file)
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -1629,11 +1629,6 @@ static int cfg_parse_global_shm_stats_file(char **args, int section_type,
                                           struct proxy *curpx, const struct proxy *defpx,
                                           const char *file, int line, char **err)
 {
-       if (!experimental_directives_allowed) {
-               memprintf(err, "'%s' directive is experimental, must be allowed via a global 'expose-experimental-directives'", args[0]);
-               return -1;
-       }
-
        if (global.shm_stats_file != NULL) {
                memprintf(err, "'%s' already specified.\n", args[0]);
                return -1;
@@ -1644,7 +1639,6 @@ static int cfg_parse_global_shm_stats_file(char **args, int section_type,
                return -1;
        }
 
-       mark_tainted(TAINTED_CONFIG_EXP_KW_DECLARED);
        global.shm_stats_file = strdup(args[1]);
        return 0;
 }
@@ -1653,11 +1647,6 @@ static int cfg_parse_global_shm_stats_file_max_objects(char **args, int section_
                                                       struct proxy *curpx, const struct proxy *defpx,
                                                       const char *file, int line, char **err)
 {
-       if (!experimental_directives_allowed) {
-               memprintf(err, "'%s' directive is experimental, must be allowed via a global 'expose-experimental-directives'", args[0]);
-               return -1;
-       }
-
        if (shm_stats_file_max_objects != -1) {
                memprintf(err, "'%s' already specified.\n", args[0]);
                return -1;
@@ -1668,7 +1657,6 @@ static int cfg_parse_global_shm_stats_file_max_objects(char **args, int section_
                return -1;
        }
 
-       mark_tainted(TAINTED_CONFIG_EXP_KW_DECLARED);
        shm_stats_file_max_objects = atoi(args[1]);
        return 0;
 }