Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-09-24 14:53:22 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2a4ab8a923d4df1805b276f217b616419308c0e5
2a4ab8a9
1 parent
f187a7de
add brokers to config
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
38 行增加
和
2 行删除
trunk/conf/full.conf
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_config.hpp
trunk/src/app/srs_app_kafka.cpp
trunk/conf/full.conf
查看文件 @
2a4ab8a
...
...
@@ -240,6 +240,10 @@ kafka {
# whether enabled kafka.
# default: off
enabled
off
;
# the broker list, broker is <ip:port>
# and use space to specify multple brokers.
# for exampl, 127.0.0.1:9092 127.0.0.1:9093
brokers
127
.
0
.
0
.
1
:
9092
;
}
#############################################################################################
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
2a4ab8a
...
...
@@ -2120,6 +2120,17 @@ int SrsConfig::global_to_json(SrsJsonObject* obj)
}
}
obj
->
set
(
dir
->
name
,
sobj
);
}
else
if
(
dir
->
name
==
"kafka"
)
{
SrsJsonObject
*
sobj
=
SrsJsonAny
::
object
();
for
(
int
j
=
0
;
j
<
(
int
)
dir
->
directives
.
size
();
j
++
)
{
SrsConfDirective
*
sdir
=
dir
->
directives
.
at
(
j
);
if
(
sdir
->
name
==
"enabled"
)
{
sobj
->
set
(
sdir
->
name
,
sdir
->
dumps_arg0_to_boolean
());
}
else
if
(
sdir
->
name
==
"brokers"
)
{
sobj
->
set
(
sdir
->
name
,
sdir
->
dumps_args
());
}
}
obj
->
set
(
dir
->
name
,
sobj
);
}
else
if
(
dir
->
name
==
"stream_caster"
)
{
SrsJsonObject
*
sobj
=
SrsJsonAny
::
object
();
for
(
int
j
=
0
;
j
<
(
int
)
dir
->
directives
.
size
();
j
++
)
{
...
...
@@ -3535,7 +3546,7 @@ int SrsConfig::check_config()
SrsConfDirective
*
conf
=
root
->
get
(
"kafka"
);
for
(
int
i
=
0
;
conf
&&
i
<
(
int
)
conf
->
directives
.
size
();
i
++
)
{
string
n
=
conf
->
at
(
i
)
->
name
;
if
(
n
!=
"enabled"
)
{
if
(
n
!=
"enabled"
&&
n
!=
"brokers"
)
{
ret
=
ERROR_SYSTEM_CONFIG_INVALID
;
srs_error
(
"unsupported kafka directive %s, ret=%d"
,
n
.
c_str
(),
ret
);
return
ret
;
...
...
@@ -4272,6 +4283,21 @@ bool SrsConfig::get_kafka_enabled()
return
SRS_CONF_PERFER_FALSE
(
conf
->
arg0
());
}
SrsConfDirective
*
SrsConfig
::
get_kafka_brokers
()
{
SrsConfDirective
*
conf
=
root
->
get
(
"kafka"
);
if
(
!
conf
)
{
return
NULL
;
}
conf
->
get
(
"brokers"
);
if
(
!
conf
||
conf
->
args
.
empty
())
{
return
NULL
;
}
return
conf
;
}
SrsConfDirective
*
SrsConfig
::
get_vhost
(
string
vhost
,
bool
try_default_vhost
)
{
srs_assert
(
root
);
...
...
trunk/src/app/srs_app_config.hpp
查看文件 @
2a4ab8a
...
...
@@ -634,6 +634,10 @@ public:
* whether the kafka enabled.
*/
virtual
bool
get_kafka_enabled
();
/**
* get the broker list, each is format in <ip:port>.
*/
virtual
SrsConfDirective
*
get_kafka_brokers
();
// vhost specified section
public:
/**
...
...
trunk/src/app/srs_app_kafka.cpp
查看文件 @
2a4ab8a
...
...
@@ -27,6 +27,7 @@
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
#include <srs_app_async_call.hpp>
#include <srs_app_utility.hpp>
#ifdef SRS_AUTO_KAFKA
...
...
@@ -64,7 +65,8 @@ int SrsKafkaProducer::start()
return
ret
;
}
srs_trace
(
"kafka worker ok, enabled:%d"
,
_srs_config
->
get_kafka_enabled
());
std
::
string
enabled
=
srs_bool2switch
(
_srs_config
->
get_kafka_enabled
());
srs_trace
(
"kafka worker ok, enabled:%s"
,
enabled
.
c_str
());
return
ret
;
}
...
...
请
注册
或
登录
后发表评论