Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Turbo码先生
redis
提交
2bc31e55
R
redis
项目概览
Turbo码先生
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2bc31e55
编写于
5月 13, 2013
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CONFIG REWRITE: support for save and syslog-facility.
上级
7e049faf
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
40 addition
and
15 deletion
+40
-15
src/config.c
src/config.c
+40
-15
未找到文件。
src/config.c
浏览文件 @
2bc31e55
...
...
@@ -31,6 +31,22 @@
#include "redis.h"
static
struct
{
const
char
*
name
;
const
int
value
;
}
validSyslogFacilities
[]
=
{
{
"user"
,
LOG_USER
},
{
"local0"
,
LOG_LOCAL0
},
{
"local1"
,
LOG_LOCAL1
},
{
"local2"
,
LOG_LOCAL2
},
{
"local3"
,
LOG_LOCAL3
},
{
"local4"
,
LOG_LOCAL4
},
{
"local5"
,
LOG_LOCAL5
},
{
"local6"
,
LOG_LOCAL6
},
{
"local7"
,
LOG_LOCAL7
},
{
NULL
,
0
}
};
/*-----------------------------------------------------------------------------
* Config file parsing
*----------------------------------------------------------------------------*/
...
...
@@ -164,21 +180,6 @@ void loadServerConfigFromString(char *config) {
if
(
server
.
syslog_ident
)
zfree
(
server
.
syslog_ident
);
server
.
syslog_ident
=
zstrdup
(
argv
[
1
]);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"syslog-facility"
)
&&
argc
==
2
)
{
struct
{
const
char
*
name
;
const
int
value
;
}
validSyslogFacilities
[]
=
{
{
"user"
,
LOG_USER
},
{
"local0"
,
LOG_LOCAL0
},
{
"local1"
,
LOG_LOCAL1
},
{
"local2"
,
LOG_LOCAL2
},
{
"local3"
,
LOG_LOCAL3
},
{
"local4"
,
LOG_LOCAL4
},
{
"local5"
,
LOG_LOCAL5
},
{
"local6"
,
LOG_LOCAL6
},
{
"local7"
,
LOG_LOCAL7
},
{
NULL
,
0
}
};
int
i
;
for
(
i
=
0
;
validSyslogFacilities
[
i
].
name
;
i
++
)
{
...
...
@@ -1298,9 +1299,33 @@ void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int
}
void
rewriteConfigSyslogfacilityOption
(
struct
rewriteConfigState
*
state
)
{
int
value
=
server
.
syslog_facility
,
j
;
int
force
=
value
!=
LOG_LOCAL0
;
char
*
name
,
*
option
=
"syslog-facility"
;
sds
line
;
for
(
j
=
0
;
validSyslogFacilities
[
j
].
name
;
j
++
)
{
if
(
validSyslogFacilities
[
j
].
value
==
value
)
{
name
=
(
char
*
)
validSyslogFacilities
[
j
].
name
;
break
;
}
}
line
=
sdscatprintf
(
sdsempty
(),
"%s %s"
,
option
,
name
);
rewriteConfigRewriteLine
(
state
,
option
,
line
,
force
);
}
void
rewriteConfigSaveOption
(
struct
rewriteConfigState
*
state
)
{
int
j
;
sds
line
;
/* Note that if there are no save parameters at all, all the current
* config line with "save" will be detected as orphaned and deleted,
* resulting into no RDB persistence as expected. */
for
(
j
=
0
;
j
<
server
.
saveparamslen
;
j
++
)
{
line
=
sdscatprintf
(
sdsempty
(),
"save %ld %d"
,
server
.
saveparams
[
j
].
seconds
,
server
.
saveparams
[
j
].
changes
);
rewriteConfigRewriteLine
(
state
,
"save"
,
line
,
1
);
}
}
void
rewriteConfigDirOption
(
struct
rewriteConfigState
*
state
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录