add func restartapplication

RUN/Cfg/RestarterApp.ini

@@ -6,5 +6,5 @@ OPTIONS=
 DELAYS=5
 
 [LOG]
-LOGDAY=18
+LOGDAY=02
 

RUN/Cfg/VMSCommServer.ini

@@ -54,7 +54,7 @@ TRAFFIC_CENTER =1
 3=�� ü
 
 [LOG]
-LOGDAY  =01
+LOGDAY  =02
 LOGLINE =1000
 INFO    =1
 DATA    =0

SRC/AppGlobalF.cpp

@@ -167,7 +167,7 @@ bool APP_ReLoadConfigInfo()
         }
 
         g_AppCfg.DbDelayTick = pIniFile->ReadString ("APPLICATION", "DBDELAYTICK", "2000").ToIntDef(2000);
-        if (g_AppCfg.DbDelayTick <  1000) g_AppCfg.DbDelayTick = 1000;
+        if (g_AppCfg.DbDelayTick <   100) g_AppCfg.DbDelayTick =   100;
         if (g_AppCfg.DbDelayTick > 25000) g_AppCfg.DbDelayTick = 25000;
 
 
@@ -176,7 +176,7 @@ bool APP_ReLoadConfigInfo()
         g_AppCfg.MaxThread = pIniFile->ReadString("RESOURCE", "MAXTHREAD", "4096").ToIntDef(4096);
         g_AppCfg.MaxGdi    = pIniFile->ReadString("RESOURCE", "MAXGDI",       "0").ToIntDef(0);
         g_AppCfg.RcRestart = pIniFile->ReadString("RESOURCE", "RESTART",      "0").ToIntDef(0) == 1 ? true : false;
-
+        //g_AppCfg.RcRestart = (pIniFile->ReadString("APPLICATION", "RESTART", "false").UpperCase() == "TRUE") ? true : false;
 
         g_AppCfg.comm.nConnectWait  = pIniFile->ReadString("COMMUNICATION", "CONNECTWAIT",  "60").ToIntDef(60);
         g_AppCfg.comm.nCmdTimeOut   = pIniFile->ReadString("COMMUNICATION", "CMDTIMEOUT",    "5").ToIntDef(5);

SRC/FrmMainF.cpp

@@ -1913,12 +1913,22 @@ void __fastcall TVmsCommMain::plRemainDblClick(TObject *Sender)
 }
 //---------------------------------------------------------------------------
 
+void __fastcall TVmsCommMain::pnlTrafDblClick(TObject *Sender)
+{
+    if (!FrmVmsLog->Showing) {
+        FrmVmsLog->Show();
+    }
+}
+//---------------------------------------------------------------------------
+
 void __fastcall TVmsCommMain::tmrDbWriteTimer(TObject *Sender)
 {
     tmrDbWrite->Enabled = false;
     AnsiString dbJobName = APP_GetDbJobName(tmrDbWrite->Tag);
     FrmVmsLog->LogMsg("Dbms Write Hang: " + dbJobName);
     MERROR("MAINxxxxxxxxxxxx=> DBMS Write Job Hang Error: %s", dbJobName.c_str());
+
+    RestartApplication("DbmReadThread");
 }
 //---------------------------------------------------------------------------
 
@@ -1929,6 +1939,12 @@ void __fastcall TVmsCommMain::tmrDbReadTimer(TObject *Sender)
     FrmVmsLog->LogMsg("Dbms Read Hang: " + dbJobName);
     MERROR("MAINxxxxxxxxxxxx=> DBMS Job Read Hang Error: %s", dbJobName.c_str());
 
+    RestartApplication("DbmThread");
+}
+//---------------------------------------------------------------------------
+
+void __fastcall TVmsCommMain::RestartApplication(String AHangJobName)
+{
 #if 0
     bool bRestart = false;
     String sRestart;
@@ -1942,7 +1958,7 @@ void __fastcall TVmsCommMain::tmrDbReadTimer(TObject *Sender)
 
     if (bRestart)
     {
-        MERROR("DBMS Job Hang Error: Server Self Die....");
+        MERROR("DBMS Job Hang Error: Server Self Die.... By %s", AnsiString(AHangJobName).c_str());
         String sRestartApp = g_sAppDir + "RestarterApp.exe";
         if (FileExists(sRestartApp))
         {
@@ -1950,7 +1966,7 @@ void __fastcall TVmsCommMain::tmrDbReadTimer(TObject *Sender)
                 for (thrIterator it=G_Threads.FObjects.begin(); it != G_Threads.FObjects.end(); ++it)
                 {
                     TItsThread *pObj = (TItsThread*)it->second;
-                    if (pObj->Name == "DbmThread")
+                    if (pObj->Name == AHangJobName)
                     {
                         TDbmThread *dbmThread = (TDbmThread*)pObj;
                         dbmThread->CloseDb();
@@ -1967,16 +1983,11 @@ void __fastcall TVmsCommMain::tmrDbReadTimer(TObject *Sender)
             g_AppCfg.bAppClose = true;
             Close();
         }
+        else {
+            MERROR("DBMS Job Hang Error: Server Self Die....: Not Found RestarterApp.exe.");
+        }
     }
 #endif
 }
 //---------------------------------------------------------------------------
 
-void __fastcall TVmsCommMain::pnlTrafDblClick(TObject *Sender)
-{
-    if (!FrmVmsLog->Showing) {
-        FrmVmsLog->Show();
-    }
-}
-//---------------------------------------------------------------------------
-

SRC/FrmMainF.h

@@ -157,6 +157,7 @@ private:	// User declarations
 	bool __fastcall CheckResource(size_t MaxMemory, DWORD MaxHandle, DWORD MaxThread, DWORD MaxGdi);
 
     void __fastcall ResetProviderTimer();
+    void __fastcall RestartApplication(String AHangJobName);
 
 public:		// User declarations
 	__fastcall TVmsCommMain(TComponent* Owner);

SRC/LIB/FrmVmsLogF.dfm

@@ -80,9 +80,6 @@ object FrmVmsLog: TFrmVmsLog
     ParentBackground = False
     ParentColor = True
     TabOrder = 0
-    ExplicitTop = 82
-    ExplicitWidth = 817
-    ExplicitHeight = 528
     object Panel1: TPanel
       Left = 0
       Top = 0
@@ -91,7 +88,6 @@ object FrmVmsLog: TFrmVmsLog
       Align = alTop
       BevelOuter = bvNone
       TabOrder = 0
-      ExplicitWidth = 813
       object Panel2: TPanel
         Left = 0
         Top = 0
@@ -127,9 +123,7 @@ object FrmVmsLog: TFrmVmsLog
         ParentShowHint = False
         ShowHint = True
         TabOrder = 1
-        Visible = False
         OnClick = btnClearClick
-        ExplicitLeft = 719
       end
       object btnCopy: TButton
         Left = 274
@@ -150,7 +144,6 @@ object FrmVmsLog: TFrmVmsLog
         ShowHint = True
         TabOrder = 2
         OnClick = btnCopyClick
-        ExplicitLeft = 766
       end
     end
     object PgLog: TPageControl
@@ -161,11 +154,8 @@ object FrmVmsLog: TFrmVmsLog
       ActivePage = TabLog
       Align = alClient
       TabOrder = 1
-      ExplicitWidth = 320
       object TabTraf: TTabSheet
         Caption = ' Traf '
-        ExplicitWidth = 281
-        ExplicitHeight = 165
         object reTrf: TMemo
           Left = 0
           Top = 0
@@ -192,17 +182,11 @@ object FrmVmsLog: TFrmVmsLog
           ScrollBars = ssBoth
           TabOrder = 0
           WordWrap = False
-          ExplicitLeft = -20
-          ExplicitTop = -84
-          ExplicitWidth = 301
-          ExplicitHeight = 249
         end
       end
       object TabLog: TTabSheet
         Caption = ' '#47196#44536' '
         ImageIndex = 1
-        ExplicitWidth = 281
-        ExplicitHeight = 165
         object reLog: TMemo
           Left = 0
           Top = 0
@@ -229,10 +213,6 @@ object FrmVmsLog: TFrmVmsLog
           ScrollBars = ssBoth
           TabOrder = 0
           WordWrap = False
-          ExplicitLeft = -24
-          ExplicitTop = -79
-          ExplicitWidth = 301
-          ExplicitHeight = 249
         end
       end
     end

SRC/VMSCommLib/FRM/FrmVmsLogF.dfm

@@ -80,9 +80,6 @@ object FrmVmsLog: TFrmVmsLog
     ParentBackground = False
     ParentColor = True
     TabOrder = 0
-    ExplicitTop = 82
-    ExplicitWidth = 817
-    ExplicitHeight = 528
     object Panel1: TPanel
       Left = 0
       Top = 0
@@ -91,7 +88,6 @@ object FrmVmsLog: TFrmVmsLog
       Align = alTop
       BevelOuter = bvNone
       TabOrder = 0
-      ExplicitWidth = 813
       object Panel2: TPanel
         Left = 0
         Top = 0
@@ -127,9 +123,7 @@ object FrmVmsLog: TFrmVmsLog
         ParentShowHint = False
         ShowHint = True
         TabOrder = 1
-        Visible = False
         OnClick = btnClearClick
-        ExplicitLeft = 719
       end
       object btnCopy: TButton
         Left = 274
@@ -150,7 +144,6 @@ object FrmVmsLog: TFrmVmsLog
         ShowHint = True
         TabOrder = 2
         OnClick = btnCopyClick
-        ExplicitLeft = 766
       end
     end
     object PgLog: TPageControl
@@ -161,11 +154,8 @@ object FrmVmsLog: TFrmVmsLog
       ActivePage = TabLog
       Align = alClient
       TabOrder = 1
-      ExplicitWidth = 320
       object TabTraf: TTabSheet
         Caption = ' Traf '
-        ExplicitWidth = 281
-        ExplicitHeight = 165
         object reTrf: TMemo
           Left = 0
           Top = 0
@@ -192,17 +182,11 @@ object FrmVmsLog: TFrmVmsLog
           ScrollBars = ssBoth
           TabOrder = 0
           WordWrap = False
-          ExplicitLeft = -20
-          ExplicitTop = -84
-          ExplicitWidth = 301
-          ExplicitHeight = 249
         end
       end
       object TabLog: TTabSheet
         Caption = ' '#47196#44536' '
         ImageIndex = 1
-        ExplicitWidth = 281
-        ExplicitHeight = 165
         object reLog: TMemo
           Left = 0
           Top = 0
@@ -229,10 +213,6 @@ object FrmVmsLog: TFrmVmsLog
           ScrollBars = ssBoth
           TabOrder = 0
           WordWrap = False
-          ExplicitLeft = -24
-          ExplicitTop = -79
-          ExplicitWidth = 301
-          ExplicitHeight = 249
         end
       end
     end