49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
From 2ef9dcc1ae28ace8966621a69c7a9342bde3c183 Mon Sep 17 00:00:00 2001
|
|
From: Nathan Scott <nathans@redhat.com>
|
|
Date: Tue, 26 Sep 2017 14:42:56 +1000
|
|
Subject: [PATCH 3/3] backward compatibility for 2.x series config file options
|
|
|
|
---
|
|
src/config.c | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
diff --git a/src/config.c b/src/config.c
|
|
index c1919f2..3bd4374 100644
|
|
--- a/src/config.c
|
|
+++ b/src/config.c
|
|
@@ -451,6 +451,10 @@ void loadServerConfigFromString(char *config) {
|
|
server.hash_max_ziplist_entries = memtoll(argv[1], NULL);
|
|
} else if (!strcasecmp(argv[0],"hash-max-ziplist-value") && argc == 2) {
|
|
server.hash_max_ziplist_value = memtoll(argv[1], NULL);
|
|
+ } else if (!strcasecmp(argv[0],"hash-max-zipmap-entries") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
+ } else if (!strcasecmp(argv[0],"hash-max-zipmap-value") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
} else if (!strcasecmp(argv[0],"list-max-ziplist-entries") && argc == 2){
|
|
/* DEAD OPTION */
|
|
} else if (!strcasecmp(argv[0],"list-max-ziplist-value") && argc == 2) {
|
|
@@ -619,6 +623,20 @@ void loadServerConfigFromString(char *config) {
|
|
err = sentinelHandleConfiguration(argv+1,argc-1);
|
|
if (err) goto loaderr;
|
|
}
|
|
+ } else if (!strcasecmp(argv[0],"vm-enabled") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
+ } else if (!strcasecmp(argv[0],"really-use-vm") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
+ } else if (!strcasecmp(argv[0],"vm-swap-file") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
+ } else if (!strcasecmp(argv[0],"vm-max-memory") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
+ } else if (!strcasecmp(argv[0],"vm-page-size") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
+ } else if (!strcasecmp(argv[0],"vm-pages") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
+ } else if (!strcasecmp(argv[0],"vm-max-threads") && argc == 2) {
|
|
+ /* DEAD OPTION */
|
|
} else {
|
|
err = "Bad directive or wrong number of arguments"; goto loaderr;
|
|
}
|
|
--
|
|
2.13.5
|
|
|