MINOR: proxy: remove proxy_preset_defaults()

Function proxy_preset_defaults() purpose has evolved over time.
Originally, it was only used to initialize defaults proxies instances.
Until today, it was extended so that all proxies use it. Its objective
is to initialize settings to common default values.

To remove the confusion, this function is now removed. Its content is
integrated directly into init_new_proxy().

diff --git a/include/haproxy/proxy.h b/include/haproxy/proxy.h
index a4ba4be5840d055cba86d8005b2d5dd320b628ac..973f1a8ad04d4ede8c1f2bbe799fd92c69e9c270 100644 (file)
--- a/include/haproxy/proxy.h
+++ b/include/haproxy/proxy.h
@@ -67,7 +67,6 @@ struct proxy *proxy_find_best_match(int cap, const char *name, int id, int *diff
 int proxy_cfg_ensure_no_http(struct proxy *curproxy);
 int proxy_cfg_ensure_no_log(struct proxy *curproxy);
 void init_new_proxy(struct proxy *p);
-void proxy_preset_defaults(struct proxy *defproxy);
 void proxy_free_defaults(struct proxy *defproxy);
 void proxy_destroy_defaults(struct proxy *px);
 void proxy_destroy_all_unref_defaults(void);

diff --git a/src/proxy.c b/src/proxy.c
index e4e32a2a18952f19be3882c08c72235429dc0377..1d4bbf413d697fe0a3bece698f2e36d413a02ad8 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1491,9 +1491,9 @@ int proxy_cfg_ensure_no_log(struct proxy *curproxy)
        return 0;
 }
 
-/* Perform the most basic initialization of a proxy :
- * memset(), list_init(*), reset_timeouts(*).
- * Any new proxy or peer should be initialized via this function.
+/* Perform the most basic initialization of <p> proxy and define some common
+ * default parameters values. Any new proxy or peer should be initialized via
+ * this function.
  */
 void init_new_proxy(struct proxy *p)
 {
@@ -1551,8 +1551,26 @@ void init_new_proxy(struct proxy *p)
 
        HA_RWLOCK_INIT(&p->lock);
 
-       /* initialize the default settings */
-       proxy_preset_defaults(p);
+       lf_expr_init(&p->logformat);
+       lf_expr_init(&p->logformat_sd);
+       lf_expr_init(&p->format_unique_id);
+       lf_expr_init(&p->logformat_error);
+
+       /* initialize parameters to common default values */
+       p->mode = PR_MODE_TCP;
+       p->options |= PR_O_REUSE_SAFE;
+       p->max_out_conns = MAX_SRV_LIST;
+       p->email_alert.level = LOG_ALERT;
+       p->load_server_state_from_file = PR_SRV_STATE_FILE_UNSPEC;
+
+       if (!(p->cap & PR_CAP_INT)) {
+               p->maxconn = cfg_maxpconn;
+               p->conn_retries = CONN_RETRIES;
+       }
+       else {
+               p->options2 |= PR_O2_INDEPSTR;
+               p->timeout.connect = 5000;
+       }
 }
 
 /* Initialize per-thread proxy fields */
@@ -1567,37 +1585,9 @@ int proxy_init_per_thr(struct proxy *px)
        return 0;
 }
 
-/* Preset default settings onto proxy <defproxy>. */
-void proxy_preset_defaults(struct proxy *defproxy)
-{
-       defproxy->mode = PR_MODE_TCP;
-       defproxy->flags = 0;
-       if (!(defproxy->cap & PR_CAP_INT)) {
-               defproxy->maxconn = cfg_maxpconn;
-               defproxy->conn_retries = CONN_RETRIES;
-       }
-       defproxy->redispatch_after = 0;
-       defproxy->options = PR_O_REUSE_SAFE;
-       if (defproxy->cap & PR_CAP_INT)
-               defproxy->options2 |= PR_O2_INDEPSTR;
-       defproxy->max_out_conns = MAX_SRV_LIST;
-
-       lf_expr_init(&defproxy->logformat);
-       lf_expr_init(&defproxy->logformat_sd);
-       lf_expr_init(&defproxy->format_unique_id);
-       lf_expr_init(&defproxy->logformat_error);
-
-       defproxy->email_alert.level = LOG_ALERT;
-       defproxy->load_server_state_from_file = PR_SRV_STATE_FILE_UNSPEC;
-
-       if (defproxy->cap & PR_CAP_INT)
-               defproxy->timeout.connect = 5000;
-}
-
 /* Frees all dynamic settings allocated on a default proxy that's about to be
  * destroyed. Note that most of the fields are not even reset, so extreme care
- * is required here, and calling proxy_preset_defaults() afterwards would be
- * safer.
+ * is required here.
  */
 void proxy_free_defaults(struct proxy *defproxy)
 {

diff --git a/src/server.c b/src/server.c
index db098a800c2270b3852eefb84fb0152bce48bf2f..197e35c43069a3167a38dce14f178f19cfb1da77 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -3155,9 +3155,7 @@ struct server *new_server(struct proxy *proxy)
        }
 
        HA_RWLOCK_INIT(&srv->path_params.param_lock);
-       /* please don't put default server settings here, they are set in
-        * proxy_preset_defaults().
-        */
+
        return srv;
 }