Changeset 144

Timestamp:

01/18/10 08:41:37 (15 years ago)

Author:

ogrimm

Message:

Core system updates

Location:

Evidence

Files:

• Alarm.cc (moved) (moved from Evidence/Alarm/Alarm.cc ) (2 diffs)
• Alarm/Makefile (deleted)
• Config.cc (moved) (moved from Evidence/Config/Config.cc ) (1 diff)
• Config/Makefile (deleted)
• Config/configuration.txt (deleted)
• DColl.cc (moved) (moved from Evidence/DColl/DColl.cc )
• DColl/Makefile (deleted)
• DIM (deleted)
• Edd/Edd.pro (modified) (1 diff)
• Evidence.cc (modified) (2 diffs)
• Makefile (added)
• start (deleted)

Evidence/Alarm.cc

@@ -108 +108 @@
         if (strcmp(getInfo()->getName(),"DIS_DNS/Status") == 0) return;
         
-        // Update State if server is unavailable or with current severity of status  
+        // Update State: unavailable or current severity of status  
         if (getInfo()->getSize()==strlen(NO_LINK)+1 &&
                 strcmp(getInfo()->getString(), NO_LINK)==0) State[i] = 4;
         else {
-          State[i] = *(getInfo()->getString()+strlen(getInfo()->getString())+2);
+          State[i] = *(getInfo()->getString()+getInfo()->getSize());
 
           // Print message
@@ -132 +132 @@
    
   for (int i=0; i<NumServers; i++) {
-    snprintf(AlarmSummary+Offset, SUMMARYSIZE-Offset, "%s: %s\n", Server[i], StateString[State[i]]);
+    snprintf(AlarmSummary+Offset, SUMMARYSIZE-Offset, "%s: %s (%d)\n", Server[i], State[i]<=4 ? StateString[State[i]] : "unknown", State[i]);
         Offset += strlen(AlarmSummary+Offset);
         if (State[i] > MasterAlarm) MasterAlarm = State[i];

Evidence/Config.cc

@@ -16 +16 @@
 \********************************************************************/
 
-#define DEFAULT_CONFIG "configuration.txt"
+#define DEFAULT_CONFIG "../../config/Evidence.conf"
 #define SERVER_NAME "Config"
 

Evidence/Edd/Edd.pro

@@ -6 +6 @@
 TARGET = 
 DEPENDPATH += .
-INCLUDEPATH += . /usr/local/qwt-5.2.0/include ../DIM/ ..
+INCLUDEPATH += . .. /usr/local/qwt-5.2.0/include $(DIMDIR)/dim
 
 # Input
 HEADERS += Edd.h
 SOURCES += Edd.cc ../Evidence.cc
-LIBS += -L/usr/local/qwt-5.2.0/lib -lqwt ../DIM/libdim.a
+LIBS += -L/usr/local/qwt-5.2.0/lib -lqwt $(DIMDIR)/linux/libdim.a

Evidence/Evidence.cc

@@ -95 +95 @@
   va_end(ArgumentPointer);
 
-  snprintf(TBuf, sizeof(TBuf), "%s (%s): %s", StatusName, StateString[Severity], Tmp);
-  snprintf(SBuf, sizeof(SBuf), "%s\0%d", Tmp);
-
+  snprintf(TBuf, sizeof(TBuf), "%s (%s): %s", StatusName, StateString[Severity], Tmp); // Normal string
+  snprintf(SBuf, sizeof(SBuf), "%s*%c", Tmp, (char) Severity);
+  *(strrchr(SBuf, '*')) = '\0';  // String with severity encoding
   if (Tmp != ErrorString) free(Tmp);
   
@@ -122 +122 @@
   
   // Check if configuration request already in list
-  for (int i=0; i<ConfigNum; i++) {
+  for (unsigned int i=0; i<ConfigNum; i++) {
     if (strcmp(ConfigList[i].Name, Item) == 0) {
           // Return original value if still up to date