Changeset 12480

Timestamp:

11/09/11 22:25:54 (13 years ago)

Author:

lyard

Message:

adapted black-white listing to new requested behaviour

File:

• trunk/FACT++/src/datalogger.cc (modified) (1 diff)

trunk/FACT++/src/datalogger.cc

@@ -627 +627 @@
 bool DataLogger::ShouldSubscribe(const string& server, const string& service)
 {
-    if (fWhiteList.size()>0 &&
-        (fWhiteList.find(server + "/") == fWhiteList.end()) &&
-        (fWhiteList.find(server + "/" + service) == fWhiteList.end()) &&
-        (fWhiteList.find("/" + service) == fWhiteList.end()))
-        return false;
 
     if ((fBlackList.find(server + "/") != fBlackList.end()) ||
          (fBlackList.find(server + "/" + service) != fBlackList.end()) ||
          (fBlackList.find("/" + service) != fBlackList.end()))
-        return false;
-
+                 {
+                     if (fWhiteList.size()>0 &&
+                        (fWhiteList.find(server + "/" + service) != fWhiteList.end()))
+                                {
+                                        if (fDebugIsOn)
+                                                Debug("White list saved service " + server + "/" + service + " from blacklisting");
+                                return true;
+                                }
+                        if (fDebugIsOn)
+                                Debug("Blacklist banned service " + server + "/" + service);
+                        return false;
+                }
     return true;
 }