Changeset 262 for Evidence/Bridge.cc

Timestamp:

07/26/10 17:53:31 (14 years ago)

Author:

ogrimm

Message:

Removed signaling to invoke ConfigChanged(), now it is run as separate thread. New command '/ResetMessage'

File:

• Evidence/Bridge.cc (modified) (4 diffs)

Evidence/Bridge.cc

@@ -50 +50 @@
 
   public:
-    Bridge(char *, int);
+    Bridge();
     ~Bridge();
 }; 
 
-// Constructor
-Bridge::Bridge(char *Name, int Port): EvidenceServer(SERVER_NAME) {
-
-  // Set primary DIM network to subscribe from
-  DimClient::setDnsNode(Name, Port);
-
-  // Initialise and request notification of configuration changes
+// Constructor (ConfigChanged() is automatically called at start-up)
+Bridge::Bridge(): EvidenceServer(SERVER_NAME) {
+
+  // Initialise
   ServerList = NULL;
   GetConfig("cmdallow", " ");
-  ActivateSignal(SIGUSR2);
-  
-  ConfigChanged();
 }
 
@@ -92 +86 @@
 
   // Check if configuratiomn changed
-  if (ExcludeString == GetConfig("exclude")) return;
-  ExcludeString = GetConfig("exclude");
-  
-  // Remove all previous subscriptions
-  Undo();
-
+  string NewExcludeString = GetConfig("exclude");
+
+  Lock();
+  if (ExcludeString != NewExcludeString) ExcludeString.swap(NewExcludeString);
+  Unlock();
+  if (ExcludeString == NewExcludeString) return;
+    
   // Compile regular expressions
   regex_t R;
+  vector<regex_t> RegEx;
+
   vector<string> Exclude = Tokenize(ExcludeString, " \t");
   for (int i=0; i<Exclude.size(); i++) {
@@ -111 +108 @@
   }
 
-  // Subscribe to top-level server list
+  // Remove previous data, set new regular expressions and subscribe to top-level server list
+  Lock();
+  Undo();
+  Bridge::RegEx = RegEx;
   ServerList = new DimInfo((char *) "DIS_DNS/SERVER_LIST", NO_LINK, this);
+  Unlock();
 }
 
@@ -267 +268 @@
         exit(EXIT_FAILURE);
   }
-          
+
+  // Set primary DIM network to subscribe from
+  DimClient::setDnsNode(argv[1], argc>2 ? atoi(argv[2]) : DEFAULT_PORT);
+
   // Static ensures calling of destructor by exit()
-  static Bridge Class(argv[1], argc>2 ? atoi(argv[2]) : DEFAULT_PORT);
+  static Bridge Class;
   
   // Sleep until signal caught