Changeset 10511 for trunk/FACT++/src

Timestamp:

05/02/11 19:05:09 (14 years ago)

Author:

tbretz

Message:

Added exit handler; call exit handler in case of fatal error; add Dim id to messages.

Location:

trunk/FACT++/src

Files:

• DimErrorRedirecter.cc (modified) (2 diffs)
• DimErrorRedirecter.h (modified) (2 diffs)

trunk/FACT++/src/DimErrorRedirecter.cc

@@ -27 +27 @@
 
     DimClient::addErrorHandler(this);
+    DimServer::addExitHandler(this);
 }
 
@@ -32 +33 @@
 {
     DimClient::addErrorHandler(0);
+    DimServer::addExitHandler(0);
 }
 
 void DimErrorRedirecter::errorHandler(int severity, int code, char *msg)
 {
+    static const string id = "DIM|";
+
     switch (severity)
     {
-    case DIM_FATAL:   fMsg.Error(msg); return;
-    case DIM_ERROR:   fMsg.Error(msg); return;
-    case DIM_WARNING: fMsg.Warn(msg);  return;
-    case DIM_INFO:    fMsg.Info(msg);  return;
+    case DIM_FATAL:   fMsg.Error(id+msg); break;
+    case DIM_ERROR:   fMsg.Error(id+msg); break;
+    case DIM_WARNING: fMsg.Warn(id+msg);  break;
+    case DIM_INFO:    fMsg.Info(id+msg);  break;
+    default:
+        stringstream str;
+        str << "DIM message with unknown severity (" << severity << "): ";
+        str << msg << " (" << code << ")";
+        fMsg.Message(str);
+        break;
     }
 
-    stringstream str;
-    str << "Severity of Dim message unknown(" << severity << "): ";
-    str << msg << "(" << code << ")";
-    fMsg.Message(str);
+    if (severity==DIM_FATAL && code==DIMDNSDUPLC)
+        exitHandler(DIMDNSDUPLC);
 
     /*

trunk/FACT++/src/DimErrorRedirecter.h

@@ -2 +2 @@
 #define FACT_DimErrorRedirecter
 
-#include <dim.hxx>
+#include <dis.hxx>
 
 class MessageImp;
 
-class DimErrorRedirecter : public DimErrorHandler
+class DimErrorRedirecter : public DimErrorHandler, public DimExitHandler
 {
 private:
@@ -14 +14 @@
 
     void errorHandler(int severity, int code, char *msg);
+    void exitHandler(int code) { exit(code); }
 
 public:
     DimErrorRedirecter(MessageImp &imp);
     ~DimErrorRedirecter();
-
 };