From 44f8a11daa7b544173960d69bdc44a2fa3aa19a7 Mon Sep 17 00:00:00 2001
From: Yuriy Vostrikov <vostrikov@corp.mail.ru>
Date: Fri, 3 Dec 2010 15:18:28 +0300
Subject: [PATCH] [box] Enable accidently disabled expire in memcached mode.
---
mod/silverbox/box.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/mod/silverbox/box.c b/mod/silverbox/box.c
index 2496b604a9..458ec4ff64 100644
--- a/mod/silverbox/box.c
+++ b/mod/silverbox/box.c
@@ -1639,13 +1639,11 @@ memcached_bound_to_primary(void *data __unused__)
{
box_bound_to_primary(NULL);
- if (0 && !cfg.remote_hot_standby) {
- struct fiber *expire =
- fiber_create("memecached_expire", -1, -1, memcached_expire, NULL);
- if (expire == NULL)
- panic("can't stared expire fiber");
- fiber_call(expire);
- }
+ struct fiber *expire =
+ fiber_create("memecached_expire", -1, -1, memcached_expire, NULL);
+ if (expire == NULL)
+ panic("can't start the expire fiber");
+ fiber_call(expire);
}
static void
@@ -1749,6 +1747,9 @@ mod_init(void)
if (cfg.memcached != 0) {
if (cfg.secondary_port != 0)
panic("in memcached mode secondary_port must be 0");
+ if (cfg.remote_hot_standby)
+ panic("remote replication is not supported in memcached mode.");
+
memcached_init();
}
--
GitLab