Change 'observe' to 'subscribe' (and incidentally 'publish') which is more common lingo.

1 files changed, 19 insertions, 19 deletions

diff --git a/src/connectionhandler.cc b/src/connectionhandler.cc
index d264abe..4cf8fc0 100644
--- a/src/connectionhandler.cc
+++ b/src/connectionhandler.cc
@@ -74,27 +74,27 @@ bool ConnectionHandler::authenticated(clientid_t clientid)
 	return authlist.find(clientid) != authlist.end() && authlist[clientid];
 }
 
-void ConnectionHandler::observe(clientid_t clientid, taskid_t taskid)
+void ConnectionHandler::subscribe(clientid_t clientid, taskid_t taskid)
 {
 	connlist[clientid].insert(taskid);
-	DEBUG(conn, "Added observer of %d\n", taskid);
+	DEBUG(conn, "Added subscriber of %d\n", taskid);
 }
 
-void ConnectionHandler::unobserve(clientid_t clientid, taskid_t taskid)
+void ConnectionHandler::unsubscribe(clientid_t clientid, taskid_t taskid)
 {
 	connlist[clientid].erase(taskid);
 }
 
-ObserverList ConnectionHandler::observerlist(TaskIdList tasks)
+SubscriberList ConnectionHandler::subscriberlist(TaskIdList tasks)
 {
-	DEBUG(conn, "Observerlist request (#tasks: %d)\n", (int)tasks.size());
-	ObserverList clients;
+	DEBUG(conn, "Subscriberlist request (#tasks: %d)\n", (int)tasks.size());
+	SubscriberList clients;
 
 	for(TaskIdList::iterator i = tasks.begin(); i != tasks.end(); i++)
 	{
 		taskid_t tid = *i;
 
-		DEBUG(conn, "Locating observers of node %d\n", tid);
+		DEBUG(conn, "Locating subscribers of node %d\n", tid);
 		for(ConnectionList::iterator ci = connlist.begin();
 		    ci != connlist.end(); ci++)
 		{
@@ -125,20 +125,20 @@ TEST_BEGIN;
 ConnectionHandler &h = connection_handler;
 
 h.init((clientid_t)1);
-h.observe((clientid_t)1, (taskid_t)1);
-h.observe((clientid_t)1, (taskid_t)2);
+h.subscribe((clientid_t)1, (taskid_t)1);
+h.subscribe((clientid_t)1, (taskid_t)2);
 
 h.init((clientid_t)2);
-h.observe((clientid_t)2, (taskid_t)1);
-h.observe((clientid_t)2, (taskid_t)2);
+h.subscribe((clientid_t)2, (taskid_t)1);
+h.subscribe((clientid_t)2, (taskid_t)2);
 
 h.init((clientid_t)3);
-h.observe((clientid_t)3, (taskid_t)3);
+h.subscribe((clientid_t)3, (taskid_t)3);
 
 {
 	TaskIdList tasks;
 	tasks.push_back((taskid_t)1);
-	ObserverList clst = h.observerlist(tasks);
+	SubscriberList clst = h.subscriberlist(tasks);
 
 	TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?");
 	TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?");
@@ -148,7 +148,7 @@ h.observe((clientid_t)3, (taskid_t)3);
 {
 	TaskIdList tasks;
 	tasks.push_back((taskid_t)3);
-	ObserverList clst = h.observerlist(tasks);
+	SubscriberList clst = h.subscriberlist(tasks);
 
 	TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?");
 	TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?");
@@ -158,7 +158,7 @@ h.observe((clientid_t)3, (taskid_t)3);
 {
 	TaskIdList tasks;
 	tasks.push_back((taskid_t)4);
-	ObserverList clst = h.observerlist(tasks);
+	SubscriberList clst = h.subscriberlist(tasks);
 
 	TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?");
 	TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?");
@@ -170,7 +170,7 @@ h.observe((clientid_t)3, (taskid_t)3);
 	tasks.push_back((taskid_t)1);
 	tasks.push_back((taskid_t)2);
 	tasks.push_back((taskid_t)3);
-	ObserverList clst = h.observerlist(tasks);
+	SubscriberList clst = h.subscriberlist(tasks);
 
 	TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?");
 	TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?");
@@ -183,7 +183,7 @@ h.close((clientid_t)1);
 	tasks.push_back((taskid_t)1);
 	tasks.push_back((taskid_t)2);
 	tasks.push_back((taskid_t)3);
-	ObserverList clst = h.observerlist(tasks);
+	SubscriberList clst = h.subscriberlist(tasks);
 
 	TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?");
 	TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?");
@@ -196,7 +196,7 @@ h.close((clientid_t)2);
 	tasks.push_back((taskid_t)1);
 	tasks.push_back((taskid_t)2);
 	tasks.push_back((taskid_t)3);
-	ObserverList clst = h.observerlist(tasks);
+	SubscriberList clst = h.subscriberlist(tasks);
 
 	TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?");
 	TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?");
@@ -209,7 +209,7 @@ h.close((clientid_t)3);
 	tasks.push_back((taskid_t)1);
 	tasks.push_back((taskid_t)2);
 	tasks.push_back((taskid_t)3);
-	ObserverList clst = h.observerlist(tasks);
+	SubscriberList clst = h.subscriberlist(tasks);
 
 	TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?");
 	TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?");