external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

add brokers to config

Browse source
This commit is contained in:
winlin 2015-09-24 14:53:22 +08:00
parent f187a7deef
commit 2a4ab8a923
4 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/conf/full.conf
View file

@ -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;
}
#############################################################################################

28
trunk/src/app/srs_app_config.cpp
View file

@ -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);

4
trunk/src/app/srs_app_config.hpp
View file

@ -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:
/**

4
trunk/src/app/srs_app_kafka.cpp
View file

@ -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;
}