diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-04-30 13:32:36 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-04-30 13:32:36 +0100 |
| commit | 40c6406e4a8bf633fee611a8c0d5ff980f7d3836 (patch) | |
| tree | 1e3a005b4c182781d8c1221e5d7c75e4fb398929 /src/libserver | |
| parent | d6643f35d783784911ad2e2ca754bcfed29eb11d (diff) | |
| download | rspamd-40c6406e4a8bf633fee611a8c0d5ff980f7d3836.tar.gz rspamd-40c6406e4a8bf633fee611a8c0d5ff980f7d3836.zip | |
Remove memcached support.
Diffstat (limited to 'src/libserver')
| -rw-r--r-- | src/libserver/cfg_file.h | 24 | ||||
| -rw-r--r-- | src/libserver/cfg_utils.c | 6 |
2 files changed, 0 insertions, 30 deletions
diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h index ae809ea25..f502d5775 100644 --- a/src/libserver/cfg_file.h +++ b/src/libserver/cfg_file.h @@ -9,7 +9,6 @@ #include "config.h" #include "mem_pool.h" #include "upstream.h" -#include "memcached.h" #include "symbols_cache.h" #include "cfg_rcl.h" #include "utlist.h" @@ -17,10 +16,6 @@ #define DEFAULT_BIND_PORT 11333 #define DEFAULT_CONTROL_PORT 11334 -#define MAX_MEMCACHED_SERVERS 4 -#define DEFAULT_MEMCACHED_PORT 11211 -/* Memcached timeouts */ -#define DEFAULT_MEMCACHED_CONNECT_TIMEOUT 1000 /* Upstream timeouts */ #define DEFAULT_UPSTREAM_ERROR_TIME 10 #define DEFAULT_UPSTREAM_ERROR_TIME 10 @@ -88,17 +83,6 @@ struct rspamd_regexp { }; /** - * Memcached server object - */ -struct memcached_server { - struct upstream up; /**< common upstream base */ - struct in_addr addr; /**< address of server */ - guint16 port; /**< port to connect */ - short alive; /**< is this server alive */ - gint16 num; /**< number of servers in case of mirror */ -}; - -/** * script module list item */ struct script_module { @@ -299,14 +283,6 @@ struct rspamd_config { guint32 statfile_sync_timeout; /**< synchronization timeout */ gboolean mlock_statfile_pool; /**< use mlock (2) for locking statfiles */ - struct memcached_server memcached_servers[MAX_MEMCACHED_SERVERS]; /**< memcached servers */ - gsize memcached_servers_num; /**< number of memcached servers */ - memc_proto_t memcached_protocol; /**< memcached protocol */ - guint memcached_error_time; /**< memcached error time (see upstream documentation) */ - guint memcached_dead_time; /**< memcached dead time */ - guint memcached_maxerrors; /**< maximum number of errors */ - guint memcached_connect_timeout; /**< connection timeout */ - gboolean delivery_enable; /**< is delivery agent is enabled */ gchar *deliver_host; /**< host for mail deliviring */ struct in_addr deliver_addr; /**< its address */ diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index 120128f5e..f2b56b364 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -261,12 +261,6 @@ rspamd_parse_bind_line (struct rspamd_config *cfg, struct rspamd_worker_conf *cf void rspamd_config_defaults (struct rspamd_config *cfg) { - - cfg->memcached_error_time = DEFAULT_UPSTREAM_ERROR_TIME; - cfg->memcached_dead_time = DEFAULT_UPSTREAM_DEAD_TIME; - cfg->memcached_maxerrors = DEFAULT_UPSTREAM_MAXERRORS; - cfg->memcached_protocol = TCP_TEXT; - cfg->dns_timeout = 1000; cfg->dns_retransmits = 5; /* After 20 errors do throttling for 10 seconds */ |