Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
d50ae36e
Commit
d50ae36e
authored
Nov 22, 2019
by
Madelyn Olson
Browse files
Fixed a bug with enum log printing
parent
818a4e0f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
d50ae36e
...
@@ -662,8 +662,8 @@ void loadServerConfig(char *filename, char *options) {
...
@@ -662,8 +662,8 @@ void loadServerConfig(char *filename, char *options) {
#define config_set_special_field(_name) \
#define config_set_special_field(_name) \
} else if (!strcasecmp(c->argv[2]->ptr,_name)) {
} else if (!strcasecmp(c->argv[2]->ptr,_name)) {
#define config_set_special_field_with_alias(_name,_name2) \
#define config_set_special_field_with_alias(_name
1
,_name2) \
} else if (!strcasecmp(c->argv[2]->ptr,_name) || \
} else if (!strcasecmp(c->argv[2]->ptr,_name
1
) || \
!strcasecmp(c->argv[2]->ptr,_name2)) {
!strcasecmp(c->argv[2]->ptr,_name2)) {
#define config_set_else } else
#define config_set_else } else
...
@@ -854,10 +854,10 @@ void configSetCommand(client *c) {
...
@@ -854,10 +854,10 @@ void configSetCommand(client *c) {
#endif
#endif
/* Numerical fields.
/* Numerical fields.
* config_set_numerical_field(name,var,min,max) */
* config_set_numerical_field(name,var,min,max) */
}
config_set_numerical_field
(
"repl-backlog-ttl"
,
server
.
repl_backlog_time_limit
,
0
,
LONG_MAX
)
{
}
config_set_numerical_field
(
}
config_set_numerical_field
(
"stream-node-max-entries"
,
server
.
stream_node_max_entries
,
0
,
LLONG_MAX
)
{
"stream-node-max-entries"
,
server
.
stream_node_max_entries
,
0
,
LLONG_MAX
)
{
}
config_set_numerical_field
(
"repl-backlog-ttl"
,
server
.
repl_backlog_time_limit
,
0
,
LONG_MAX
)
{
}
config_set_numerical_field
(
}
config_set_numerical_field
(
"min-slaves-to-write"
,
server
.
repl_min_slaves_to_write
,
0
,
INT_MAX
)
{
"min-slaves-to-write"
,
server
.
repl_min_slaves_to_write
,
0
,
INT_MAX
)
{
refreshGoodSlavesCount
();
refreshGoodSlavesCount
();
...
@@ -891,8 +891,8 @@ void configSetCommand(client *c) {
...
@@ -891,8 +891,8 @@ void configSetCommand(client *c) {
}
}
freeMemoryIfNeededAndSafe
();
freeMemoryIfNeededAndSafe
();
}
}
}
config_set_memory_field
(
}
config_set_memory_field
(
"client-query-buffer-limit"
,
server
.
client_max_querybuf_len
)
{
"client-query-buffer-limit"
,
server
.
client_max_querybuf_len
)
{
}
config_set_memory_field
(
"repl-backlog-size"
,
ll
)
{
}
config_set_memory_field
(
"repl-backlog-size"
,
ll
)
{
resizeReplicationBacklog
(
ll
);
resizeReplicationBacklog
(
ll
);
}
config_set_memory_field
(
"auto-aof-rewrite-min-size"
,
ll
)
{
}
config_set_memory_field
(
"auto-aof-rewrite-min-size"
,
ll
)
{
...
@@ -1811,8 +1811,8 @@ int rewriteConfig(char *path) {
...
@@ -1811,8 +1811,8 @@ int rewriteConfig(char *path) {
rewriteConfigBytesOption
(
state
,
"client-query-buffer-limit"
,
server
.
client_max_querybuf_len
,
PROTO_MAX_QUERYBUF_LEN
);
rewriteConfigBytesOption
(
state
,
"client-query-buffer-limit"
,
server
.
client_max_querybuf_len
,
PROTO_MAX_QUERYBUF_LEN
);
rewriteConfigYesNoOption
(
state
,
"appendonly"
,
server
.
aof_enabled
,
0
);
rewriteConfigYesNoOption
(
state
,
"appendonly"
,
server
.
aof_enabled
,
0
);
rewriteConfigStringOption
(
state
,
"appendfilename"
,
server
.
aof_filename
,
CONFIG_DEFAULT_AOF_FILENAME
);
rewriteConfigStringOption
(
state
,
"appendfilename"
,
server
.
aof_filename
,
CONFIG_DEFAULT_AOF_FILENAME
);
rewriteConfigYesNoOption
(
state
,
"cluster-enabled"
,
server
.
cluster_enabled
,
0
);
rewriteConfigBytesOption
(
state
,
"auto-aof-rewrite-min-size"
,
server
.
aof_rewrite_min_size
,
AOF_REWRITE_MIN_SIZE
);
rewriteConfigBytesOption
(
state
,
"auto-aof-rewrite-min-size"
,
server
.
aof_rewrite_min_size
,
AOF_REWRITE_MIN_SIZE
);
rewriteConfigYesNoOption
(
state
,
"cluster-enabled"
,
server
.
cluster_enabled
,
0
);
rewriteConfigStringOption
(
state
,
"cluster-config-file"
,
server
.
cluster_configfile
,
CONFIG_DEFAULT_CLUSTER_CONFIG_FILE
);
rewriteConfigStringOption
(
state
,
"cluster-config-file"
,
server
.
cluster_configfile
,
CONFIG_DEFAULT_CLUSTER_CONFIG_FILE
);
rewriteConfigNotifykeyspaceeventsOption
(
state
);
rewriteConfigNotifykeyspaceeventsOption
(
state
);
rewriteConfigNumericalOption
(
state
,
"stream-node-max-entries"
,
server
.
stream_node_max_entries
,
OBJ_STREAM_NODE_MAX_ENTRIES
);
rewriteConfigNumericalOption
(
state
,
"stream-node-max-entries"
,
server
.
stream_node_max_entries
,
OBJ_STREAM_NODE_MAX_ENTRIES
);
...
@@ -1981,8 +1981,8 @@ static int configEnumLoad(typeData data, sds *argv, int argc, char **err) {
...
@@ -1981,8 +1981,8 @@ static int configEnumLoad(typeData data, sds *argv, int argc, char **err) {
sds
enumerr
=
sdsnew
(
"argument must be one of the following: "
);
sds
enumerr
=
sdsnew
(
"argument must be one of the following: "
);
configEnum
*
enumNode
=
data
.
enumd
.
enum_value
;
configEnum
*
enumNode
=
data
.
enumd
.
enum_value
;
while
(
enumNode
->
name
!=
NULL
)
{
while
(
enumNode
->
name
!=
NULL
)
{
sdscatlen
(
enumerr
,
enumNode
->
name
,
strlen
(
enumNode
->
name
));
enumerr
=
sdscatlen
(
enumerr
,
enumNode
->
name
,
strlen
(
enumNode
->
name
));
sdscatlen
(
enumerr
,
", "
,
2
);
enumerr
=
sdscatlen
(
enumerr
,
", "
,
2
);
enumNode
++
;
enumNode
++
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment