diff options
Diffstat (limited to 'src/munia_proto.cc')
| -rw-r--r-- | src/munia_proto.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/munia_proto.cc b/src/munia_proto.cc index 6e944cf..333e3c9 100644 --- a/src/munia_proto.cc +++ b/src/munia_proto.cc @@ -211,17 +211,17 @@ int callback_lws_task(struct lws *wsi, while(omi != omsgs.end()) { DEBUG(proto, "Message\n"); - if(omi->cmd == cmd::observe) + if(omi->cmd == cmd::subscribe) { - connection_handler.observe(wsi, omi->observe.id); + connection_handler.subscribe(wsi, omi->subscribe.id); TaskIdList ids; try { - ids = task_manager.subTasks(omi->observe.id); + ids = task_manager.subTasks(omi->subscribe.id); } catch(...) { - DEBUG(proto, "No such node %d\n", omi->observe.id); + DEBUG(proto, "No such node %d\n", omi->subscribe.id); omi++; continue; } @@ -231,7 +231,7 @@ int callback_lws_task(struct lws *wsi, task_t task = task_manager.task(*id); message_t createmsg = create_msg_create(task); - createmsg.tid = omi->observe.id; + createmsg.tid = omi->subscribe.id; msgqueue[wsi].push_back(createmsg); std::map<std::string, std::string>::iterator ai = @@ -239,8 +239,8 @@ int callback_lws_task(struct lws *wsi, while(ai != task.attributes.end()) { message_t updatemsg = create_msg_update(task, ai->first); - DEBUG(observe, "%s\n", ai->first.c_str()); - updatemsg.tid = omi->observe.id; + DEBUG(subscribe, "%s\n", ai->first.c_str()); + updatemsg.tid = omi->subscribe.id; msgqueue[wsi].push_back(updatemsg); ai++; } @@ -248,17 +248,17 @@ int callback_lws_task(struct lws *wsi, id++; } } - else if(omi->cmd == cmd::unobserve) + else if(omi->cmd == cmd::unsubscribe) { - connection_handler.unobserve(wsi, omi->unobserve.id); + connection_handler.unsubscribe(wsi, omi->unsubscribe.id); TaskIdList ids; try { - ids = task_manager.subTasks(omi->unobserve.id); + ids = task_manager.subTasks(omi->unsubscribe.id); } catch(...) { - DEBUG(proto, "No such node %d\n", omi->unobserve.id); + DEBUG(proto, "No such node %d\n", omi->unsubscribe.id); omi++; continue; } @@ -268,9 +268,9 @@ int callback_lws_task(struct lws *wsi, task_t task = task_manager.task(*id); message_t removemsg = create_msg_remove(task); - removemsg.tid = omi->unobserve.id; + removemsg.tid = omi->unsubscribe.id; msgqueue[wsi].push_back(removemsg); - DEBUG(unobserve, "remove id: %d\n", *id); + DEBUG(unsubscribe, "remove id: %d\n", *id); id++; } @@ -281,16 +281,16 @@ int callback_lws_task(struct lws *wsi, DEBUG(proto, "%d nodes affected by command\n", (int)omi->nodes.size()); - ObserverList clients = connection_handler.observerlist(omi->nodes); + SubscriberList clients = connection_handler.subscriberlist(omi->nodes); DEBUG(proto, "Writing message to %d clients\n", (int)clients.size()); - ObserverList::iterator ci = clients.begin(); + SubscriberList::iterator ci = clients.begin(); while(ci != clients.end()) { clientid_t clientid = (*ci).first; taskid_t tid = (*ci).second; - DEBUG(proto, "Observer id of task: %d\n", tid); + DEBUG(proto, "Subscriber id of task: %d\n", tid); message_t msg = *omi; msg.tid = tid; |