external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

kafka use temp transport to fetch metadata.

Browse source
This commit is contained in:
winlin 2015-10-22 16:57:27 +08:00
parent 531b658f8e
commit 22fa9a0f1f
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -275,8 +275,6 @@ SrsKafkaProducer::SrsKafkaProducer()
cache = new SrsKafkaCache(); cache = new SrsKafkaCache();
lb = new SrsLbRoundRobin(); lb = new SrsLbRoundRobin();
transport = new SrsTcpClient();
kafka = new SrsKafkaClient(transport);
} }
SrsKafkaProducer::~SrsKafkaProducer() SrsKafkaProducer::~SrsKafkaProducer()
@ -284,8 +282,6 @@ SrsKafkaProducer::~SrsKafkaProducer()
clear_metadata(); clear_metadata();
srs_freep(lb); srs_freep(lb);
srs_freep(kafka);
srs_freep(transport);
srs_freep(worker); srs_freep(worker);
srs_freep(pthread); srs_freep(pthread);
@ -443,6 +439,12 @@ int SrsKafkaProducer::request_metadata()
return ret; return ret;
} }
SrsTcpClient* transport = new SrsTcpClient();
SrsAutoFree(SrsTcpClient, transport);
SrsKafkaClient* kafka = new SrsKafkaClient(transport);
SrsAutoFree(SrsKafkaClient, kafka);
std::string server; std::string server;
int port = SRS_CONSTS_KAFKA_DEFAULT_PORT; int port = SRS_CONSTS_KAFKA_DEFAULT_PORT;
if (true) { if (true) {
@ -460,7 +462,6 @@ int SrsKafkaProducer::request_metadata()
} }
// reconnect to kafka server. // reconnect to kafka server.
transport->close();
if ((ret = transport->connect(server, port, SRS_CONSTS_KAFKA_TIMEOUT_US)) != ERROR_SUCCESS) { if ((ret = transport->connect(server, port, SRS_CONSTS_KAFKA_TIMEOUT_US)) != ERROR_SUCCESS) {
srs_error("kafka connect %s:%d failed. ret=%d", server.c_str(), port, ret); srs_error("kafka connect %s:%d failed. ret=%d", server.c_str(), port, ret);
return ret; return ret;

2
trunk/src/app/srs_app_kafka.hpp
View file

@ -164,8 +164,6 @@ public:
private: private:
SrsLbRoundRobin* lb; SrsLbRoundRobin* lb;
SrsAsyncCallWorker* worker; SrsAsyncCallWorker* worker;
SrsTcpClient* transport;
SrsKafkaClient* kafka;
public: public:
SrsKafkaProducer(); SrsKafkaProducer();
virtual ~SrsKafkaProducer(); virtual ~SrsKafkaProducer();