Compiles

SubscriptionManager.cpp

@@ -6,49 +6,62 @@ namespace core {
    SubscriptionManager::SubscriptionManager() {}
 
    int SubscriptionManager::removeSessionSubscriptions(TCPSession &session) {
-      int count = 0;
-      for(auto subscription = subscriptions.begin(); subscription < subscriptions.end(); ++subscription) {
-         count += (*subscription)->unsubscribe(session);
+      int countSubscribed = 0;
+      int countPublished = 0;
+      for(auto subscription = subscriptions.begin(); subscription != subscriptions.end();) {
+         countSubscribed += (*subscription).second->unsubscribe(session);
+         if(&(*subscription).second->owner == &session) {
+            subscription = subscriptions.erase(subscription);
+            delete (*subscription).second;
+            ++countPublished;
+         } else
+           ++subscription;
+
       }
-      coreutils::Log(coreutils::LOG_DEBUG_2) << "Removed session from " << count << " subscriptions.";
-      return count;
+      coreutils::Log(coreutils::LOG_DEBUG_2) << "Removed session from " << countSubscribed << " subscription(s).";
+      coreutils::Log(coreutils::LOG_DEBUG_2) << "Cancelled " << countPublished << " channel(s) for session.";
+      return countSubscribed;
    }
 
    int SubscriptionManager::processCommand(coreutils::ZString &request, TCPSession &session) {
 
+      coreutils::Log(coreutils::LOG_DEBUG_2) << "Processing subscription request: " << request << ".";
+
       if(request[0].equals("publish")) {
-	      subscriptions.push_back(new Subscription(request[1].str(), session));
+         Subscription *newSubscription = new Subscription(request[1].str(), session);
+         subscriptions.insert(std::make_pair(request[1].str(), newSubscription));
+
 	      return 1;
       } else if(request[0].equals("catalog")) {
       	session.out << ":catalog:";
-	      for(auto subscription = subscriptions.begin(); subscription < subscriptions.end(); ++subscription) {
-     	      session.out << (*subscription)->id << "|";
-            (*subscription)->processCommand(request, session);
+         for(auto const& [key, subscription] : subscriptions) {
+	  	      session.out << subscription->id << "|";
+            subscription->processCommand(request, session);
      	      session.out << (";");
          }
  	      session.out << std::endl;
       	return 1;
       }
 
-	   for(auto subscription = subscriptions.begin(); subscription < subscriptions.end(); ++subscription) {
-	      if(request[1].equals((*subscription)->id)) {
-            if(request[0].equals("unpublish")) {
-	            subscriptions.erase(subscription);
-            } else if(request[0].equals("subscribe")) {
-   	         (*subscription)->subscribe(session);
-            } else if(request[0].equals("unsubscribe")) {
-	            (*subscription)->unsubscribe(session);
-            } else if(request[0].equals("event")) {
-               if((*subscription)->owner == &session) {
-                  std::stringstream out;
-                  (*subscription)->process(request, out);
-	               (*subscription)->event(out);
-               }
-               else
-                 return 0;
+      auto subscription = subscriptions[request[1].str()];
+
+	   if(request[1].equals(subscription->id)) {
+         if(request[0].equals("unpublish")) {
+	         subscriptions.erase(request[1].str());
+         } else if(request[0].equals("subscribe")) {
+   	      subscription->subscribe(session);
+         } else if(request[0].equals("unsubscribe")) {
+	         subscription->unsubscribe(session);
+         } else if(request[0].equals("event")) {
+            if(&subscription->owner == &session) {
+               std::stringstream out;
+               subscription->process(request, out);
+	            subscription->event(out);
             }
-            return 1;
+            else
+              return 0;
          }
+         return 1;
       }
       return 0;
    }