add cname in error msg

stanzhu · May 15, 2014 · 262b24d · 262b24d
1 parent d34dfd8
commit 262b24d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/comet/server.cpp b/src/comet/server.cpp
@@ -207,18 +207,18 @@ int Server::sub(struct evhttp_request *req, Subscriber::Type sub_type){
 		channel = this->new_channel(cname);
 		if(!channel){
 			//evhttp_send_reply(req, 429, "Too many channels", NULL);
-			Subscriber::send_error_reply(sub_type, req, cb, "429", "Too many channels");
+			Subscriber::send_error_reply(sub_type, req, cb, cname, "429", "Too many channels");
 			return 0;
 		}
 	}
 	if(!channel || (this->auth == AUTH_TOKEN && channel->token != token)){
 		//evhttp_send_reply(req, 401, "Token error", NULL);
-		Subscriber::send_error_reply(sub_type, req, cb, "401", "Token error");
+		Subscriber::send_error_reply(sub_type, req, cb, cname, "401", "Token error");
 		return 0;
 	}
 	if(channel->subs.size >= ServerConfig::max_subscribers_per_channel){
 		//evhttp_send_reply(req, 429, "Too many subscribers", NULL);
-		Subscriber::send_error_reply(sub_type, req, cb, "429", "Too many subscribers");
+		Subscriber::send_error_reply(sub_type, req, cb, cname, "429", "Too many subscribers");
 		return 0;
 	}
 

diff --git a/src/comet/subscriber.cpp b/src/comet/subscriber.cpp
@@ -136,7 +136,7 @@ void Subscriber::send_chunk(int seq, const char *type, const char *content){
 	}
 }
 
-void Subscriber::send_error_reply(int sub_type, struct evhttp_request *req, const char *cb, const char *type, const char *content){
+void Subscriber::send_error_reply(int sub_type, struct evhttp_request *req, const char *cb, const std::string &cname, const char *type, const char *content){
 	struct evbuffer *buf = evbuffer_new();
 
 	if(sub_type == POLL){
@@ -147,7 +147,7 @@ void Subscriber::send_error_reply(int sub_type, struct evhttp_request *req, cons
 
 	evbuffer_add_printf(buf,
 		"{\"type\":\"%s\",\"cname\":\"%s\",\"seq\":%d,\"content\":\"%s\"}",
-		type, "", 0, content);
+		type, cname.c_str(), 0, content);
 
 	if(sub_type == POLL){
 		evbuffer_add_printf(buf, ");");

diff --git a/src/comet/subscriber.h b/src/comet/subscriber.h
@@ -40,7 +40,7 @@ class Subscriber{
 	void noop();
 	void send_old_msgs();
 
-	static void send_error_reply(int sub_type, struct evhttp_request *req, const char *cb, const char *type, const char *content);
+	static void send_error_reply(int sub_type, struct evhttp_request *req, const char *cb, const std::string &cname, const char *type, const char *content);
 };
 
 #endif