Fix restart the process

hggq · Jan 1, 2025 · 5aba3d0 · 5aba3d0
1 parent 3f682a7
commit 5aba3d0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 87 deletions.
diff --git a/conf/cppcms.sql b/conf/cppcms.sql
@@ -476,87 +476,7 @@ CREATE TABLE `testb` (
 
 INSERT INTO `testb` (`tid`, `score`, `name`) VALUES
 (4, 89, 'caname'),
-(5, 5, 'aa'),
-(6, 5, 'aa'),
-(7, 5, 'aa'),
-(8, 5, 'aa'),
-(9, 5, 'aa'),
-(10, 5, 'aa'),
-(11, 5, 'aa'),
-(12, 5, 'aa'),
-(13, 5, 'aa'),
-(14, 5, 'aa'),
-(15, 5, 'aa'),
-(16, 5, 'aa'),
-(17, 5, 'aa'),
-(18, 5, 'aa'),
-(19, 5, 'aa'),
-(20, 5, 'aa'),
-(21, 5, 'aa'),
-(22, 5, 'aa'),
-(23, 5, 'aa'),
-(24, 5, 'aa'),
-(25, 5, 'aa'),
-(26, 5, 'aa'),
-(27, 5, 'aa'),
-(28, 5, 'aa'),
-(29, 5, 'aa'),
-(30, 5, 'aa'),
-(31, 5, 'aa'),
-(32, 5, 'aa'),
-(33, 5, 'aa'),
-(34, 5, 'aa'),
-(35, 5, 'aa'),
-(36, 5, 'aa'),
-(37, 5, 'aa'),
-(38, 5, 'aa'),
-(39, 5, 'aa'),
-(40, 5, 'aa'),
-(41, 5, 'aa'),
-(42, 5, 'aa'),
-(43, 5, 'aa'),
-(44, 5, 'aa'),
-(45, 5, 'aa'),
-(46, 5, 'aa'),
-(47, 5, 'aa'),
-(48, 5, 'aa'),
-(49, 5, 'aa'),
-(50, 5, 'aa'),
-(51, 5, 'aa'),
-(52, 5, 'aa'),
-(53, 5, 'aa'),
-(54, 5, 'aa'),
-(55, 5, 'aa'),
-(90, 5, 'aa'),
-(91, 5, 'aa'),
-(92, 5, 'aa'),
-(93, 5, 'aa'),
-(94, 5, 'aa'),
-(95, 5, 'aa'),
-(96, 5, 'aa'),
-(97, 5, 'aa'),
-(98, 5, 'aa'),
-(99, 5, 'aa'),
-(100, 5, 'aa'),
-(101, 5, 'aa'),
-(102, 5, 'aa'),
-(103, 5, 'aa'),
-(104, 5, 'aa'),
-(105, 5, 'aa'),
-(106, 5, 'aa'),
-(107, 5, 'aa'),
-(108, 5, 'aa'),
-(109, 5, 'aa'),
-(110, 5, 'aa'),
-(111, 5, 'aa'),
-(112, 5, 'aa'),
-(113, 5, 'aa'),
-(114, 5, 'aa'),
-(115, 5, 'aa'),
-(116, 5, 'aa'),
-(117, 5, 'aa'),
-(118, 5, 'aa'),
-(119, 5, 'aa');
+
 
 -- --------------------------------------------------------
 

diff --git a/vendor/httpserver/src/server.cpp b/vendor/httpserver/src/server.cpp
@@ -4430,11 +4430,18 @@ void httpserver::httpwatch()
                 std::unique_lock<std::mutex> loglock(log_mutex);
                 error_loglist.push_back("--total_http2_count > 2 --\n"); 
                 loglock.unlock();
-                if(plan_http2_exit>0)
+                plan_http2_exit ++;
+                if(plan_http2_exit>1)
                 {
-                    isstop = true;
+                    if(old_total_count == total_count.load())
+                    {
+                        isstop = true;
+                    }
+                    else
+                    {
+                        plan_http2_exit = 0;
+                    }
                 }
-                plan_http2_exit ++;
             }
             else
             {
@@ -4448,11 +4455,19 @@ void httpserver::httpwatch()
                 std::unique_lock<std::mutex> loglock(log_mutex);
                 error_loglist.push_back("--total_http1_count > 2 --\n"); 
                 loglock.unlock();
-                if(plan_http1_exit>0)
+                plan_http1_exit ++;
+                if(plan_http1_exit >1)
                 {
-                    isstop = true;
+                    if(old_total_count==total_count.load())
+                    {
+                        isstop = true;
+                    }
+                    else
+                    {
+                        plan_http1_exit = 0;
+                    }
                 }
-                plan_http1_exit ++;
+
             }
             else
             {