Update evnsq::Client::Client(evpp::EventLoop* loop, Type t, const Opt…

…ion& ops)
Qihoo360 · Nov 9, 2016 · e09dbb5 · e09dbb5
1 parent f62d738
commit e09dbb5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/apps/evnsq/client.cc b/apps/evnsq/client.cc
@@ -15,8 +15,8 @@ namespace evnsq {
 static const std::string kNSQMagic = "  V2";
 static const std::string kOK = "OK";
 
-Client::Client(evpp::EventLoop* l, Type t, const std::string& topic, const std::string& channel, const Option& ops)
-    : loop_(l), type_(t), option_(ops), topic_(topic), channel_(channel) {}
+Client::Client(evpp::EventLoop* l, Type t, const Option& ops)
+    : loop_(l), type_(t), option_(ops) {}
 
 Client::~Client() {}
 

diff --git a/apps/evnsq/client.h b/apps/evnsq/client.h
@@ -44,11 +44,13 @@ class EVNSQ_EXPORT Client {
         return loop_;
     }
 protected:
-    Client(evpp::EventLoop* loop, Type t, const std::string& topic, const std::string& channel, const Option& ops);
+    Client(evpp::EventLoop* loop, Type t, const Option& ops);
     void HandleLoopkupdHTTPResponse(
         const std::shared_ptr<evpp::httpc::Response>& response,
         const std::shared_ptr<evpp::httpc::Request>& request);
     void OnConnection(const ConnPtr& conn);
+    void set_topic(const std::string& t) { topic_ = t; }
+    void set_channel(const std::string& c) { channel_ = c; }
 private:
     bool IsKnownNSQDAddress(const std::string& addr) const;
     void MoveToConnectingList(const ConnPtr& conn);

diff --git a/apps/evnsq/consumer.cc b/apps/evnsq/consumer.cc
@@ -14,7 +14,9 @@
 
 namespace evnsq {
 Consumer::Consumer(evpp::EventLoop* l, const std::string& topic, const std::string& channel, const Option& ops)
-    : Client(l, kConsumer, topic, channel, ops) {
+    : Client(l, kConsumer, ops) {
+    set_topic(topic);
+    set_channel(channel);
 }
 
 Consumer::~Consumer() {

diff --git a/apps/evnsq/producer.cc b/apps/evnsq/producer.cc
@@ -7,7 +7,7 @@
 namespace evnsq {
 
 Producer::Producer(evpp::EventLoop* l, const Option& ops)
-    : Client(l, kProducer, "", "", ops)
+    : Client(l, kProducer, ops)
     , current_conn_(0)
     , wait_ack_count_(0)
     , published_count_(0)