commit 87baef1: [Minor] Remove unused stuff

Vsevolod Stakhov vsevolod at highsecure.ru
Wed Aug 7 18:56:03 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-08-07 19:35:35 +0100
URL: https://github.com/rspamd/rspamd/commit/87baef19c17611f28658feb295b7c59f4dc98eee

[Minor] Remove unused stuff

---
 src/libserver/cfg_file.h  | 7 -------
 src/libserver/cfg_utils.c | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 54427c190..3c0df0319 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -411,10 +411,6 @@ struct rspamd_config {
 	GHashTable *cfg_params;                        /**< all cfg params indexed by its name in this structure */
 	gchar *dynamic_conf;                            /**< path to dynamic configuration						*/
 	ucl_object_t *current_dynamic_conf;             /**< currently loaded dynamic configuration				*/
-	GHashTable *domain_settings;                   /**< settings per-domains                               */
-	GHashTable *user_settings;                     /**< settings per-user                                  */
-	gchar *domain_settings_str;                    /**< string representation of settings					*/
-	gchar *user_settings_str;
 	gint clock_res;                                 /**< resolution of clock used							*/
 
 	GList *maps;                                    /**< maps active										*/
@@ -429,7 +425,6 @@ struct rspamd_config {
 	gchar *cache_filename;                          /**< filename of cache file								*/
 	gdouble cache_reload_time;                      /**< how often cache reload should be performed			*/
 	gchar *checksum;                               /**< real checksum of config file						*/
-	gchar *dump_checksum;                          /**< dump checksum of config file						*/
 	gpointer lua_state;                             /**< pointer to lua state								*/
 	gpointer lua_thread_pool;                       /**< pointer to lua thread (coroutine) pool				*/
 
@@ -441,8 +436,6 @@ struct rspamd_config {
 
 	gdouble dns_timeout;                            /**< timeout in milliseconds for waiting for dns reply	*/
 	guint32 dns_retransmits;                        /**< maximum retransmits count							*/
-	guint32 dns_throttling_errors;                  /**< maximum errors for starting resolver throttling	*/
-	guint32 dns_throttling_time;                    /**< time in seconds for DNS throttling					*/
 	guint32 dns_io_per_server;                      /**< number of sockets per DNS server					*/
 	const ucl_object_t *nameservers;                /**< list of nameservers or NULL to parse resolv.conf	*/
 	guint32 dns_max_requests;                       /**< limit of DNS requests per task 					*/
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 71bfa5946..cec8c6f67 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -130,9 +130,6 @@ rspamd_config_new (enum rspamd_config_init_flags flags)
 	cfg->cfg_pool = rspamd_mempool_new (8 * 1024 * 1024, "cfg");
 	cfg->dns_timeout = 1000;
 	cfg->dns_retransmits = 5;
-	/* After 20 errors do throttling for 10 seconds */
-	cfg->dns_throttling_errors = 20;
-	cfg->dns_throttling_time = 10000;
 	/* 16 sockets per DNS server */
 	cfg->dns_io_per_server = 16;
 


More information about the Commits mailing list