feat(main): 添加RaiseStopSignal()函数，用于停止自身

hevake · hevake · commit aabbd6b3963c · 2026-04-02T23:10:07.000+08:00
diff --git a/modules/main/main.h b/modules/main/main.h
@@ -79,6 +79,11 @@ void Stop();
  */
 void GetVersion(int &major, int &minor, int &rev, int &build);
 
+/**
+ * 给自身发送停止请求
+ */
+void RaiseStopSignal();
+
 //////////////////////////////////////////////////////////////////////////
 // 以下是需要开发者去实现的
 //////////////////////////////////////////////////////////////////////////
diff --git a/modules/main/misc.cpp b/modules/main/misc.cpp
@@ -116,5 +116,11 @@ void AbnormalExit()
     std::abort();
 }
 
+void RaiseStopSignal()
+{
+    LogImportant("App want to stop process");
+    ::raise(SIGTERM);
+}
+
 }
 }
diff --git a/modules/util/fs.cpp b/modules/util/fs.cpp
@@ -73,10 +73,10 @@ bool ReadStringFromTextFile(const std::string &filename, std::string &content)
                                    std::istreambuf_iterator<char>());
             return true;
         } else {
-            LogWarn("open failed, %s", filename.c_str());
+            LogNotice("open failed, %s", filename.c_str());
         }
     } catch (const exception &e) {
-        LogWarn("catch exception: %s", e.what());
+        LogNotice("catch exception: %s", e.what());
     }
     return false;
 }
@@ -94,10 +94,10 @@ bool ReadEachLineFromTextFile(const std::string &filename, const std::function<v
             }
             return true;
         } else {
-            LogWarn("open failed, %s", filename.c_str());
+            LogNotice("open failed, %s", filename.c_str());
         }
     } catch (const exception &e) {
-        LogWarn("catch exception: %s", e.what());
+        LogNotice("catch exception: %s", e.what());
     }
     return false;
 }
@@ -115,10 +115,10 @@ bool ReadAllLinesFromTextFile(const std::string &filename, std::vector<std::stri
             }
             return true;
         } else {
-            LogWarn("open failed, %s", filename.c_str());
+            LogNotice("open failed, %s", filename.c_str());
         }
     } catch (const exception &e) {
-        LogWarn("catch exception: %s", e.what());
+        LogNotice("catch exception: %s", e.what());
     }
     return false;
 }
@@ -133,10 +133,10 @@ bool ReadFirstLineFromTextFile(const std::string &filename, std::string &text)
                 text.pop_back();
             return true;
         } else {
-            LogWarn("open failed, %s", filename.c_str());
+            LogNotice("open failed, %s", filename.c_str());
         }
     } catch (const exception &e) {
-        LogWarn("catch exception: %s", e.what());
+        LogNotice("catch exception: %s", e.what());
     }
     return false;
 }
@@ -181,12 +181,12 @@ bool WriteFile(const char *filename, const void *data_ptr, size_t data_size, boo
             return true;
 
         if (wsize == -1)
-            LogWarn("write errno:%d, %s", errno, strerror(errno));
+            LogNotice("write errno:%d, %s", errno, strerror(errno));
         else
-            LogWarn("wsize:%d, size:%d", wsize, data_size);
+            LogNotice("wsize:%d, size:%d", wsize, data_size);
 
     } else
-        LogWarn("open %s failed, %d, %s", filename, errno, strerror(errno));
+        LogNotice("open %s failed, %d, %s", filename, errno, strerror(errno));
 
     return false;
 }
@@ -206,12 +206,12 @@ bool AppendFile(const char *filename, const void *data_ptr, size_t data_size, bo
             return true;
 
         if (wsize == -1)
-            LogWarn("write errno:%d, %s", errno, strerror(errno));
+            LogNotice("write errno:%d, %s", errno, strerror(errno));
         else
-            LogWarn("wsize:%d, size:%d", wsize, data_size);
+            LogNotice("wsize:%d, size:%d", wsize, data_size);
 
     } else
-        LogWarn("open %s failed, %d, %s", filename, errno, strerror(errno));
+        LogNotice("open %s failed, %d, %s", filename, errno, strerror(errno));
 
     return false;
 }
@@ -223,7 +223,7 @@ bool RemoveFile(const std::string &filename, bool allow_log_print)
         return true;
 
     if (errno != ENOENT && allow_log_print)
-        LogWarn("errno:%d (%s)", errno, strerror(errno));
+        LogNotice("errno:%d (%s)", errno, strerror(errno));
 
     return false;
 }
@@ -235,7 +235,7 @@ bool MakeSymbolLink(const std::string &old_path, const std::string &new_path, bo
         return true;
 
     if (allow_log_print)
-        LogWarn("errno:%d (%s)", errno, strerror(errno));
+        LogNotice("errno:%d (%s)", errno, strerror(errno));
     return false;
 }
 
@@ -246,7 +246,7 @@ bool MakeLink(const std::string &old_path, const std::string &new_path, bool all
         return true;
 
     if (allow_log_print)
-        LogWarn("errno:%d (%s)", errno, strerror(errno));
+        LogNotice("errno:%d (%s)", errno, strerror(errno));
     return false;
 }
 
@@ -259,7 +259,7 @@ bool MakeDirectory(const std::string &origin_dir_path, bool allow_log_print)
 {
     if (origin_dir_path.empty()) {
         if (allow_log_print)
-            LogWarn("origin_dir_path is empty");
+            LogNotice("origin_dir_path is empty");
         return false;
     }
 
@@ -286,18 +286,18 @@ bool MakeDirectory(const std::string &origin_dir_path, bool allow_log_print)
                 if (errno == ENOENT) {  //! 如果trimmed_dir_path指定的inode不存在，则创建目录
                     if (::mkdir(trimmed_dir_path.c_str(), 0775) != 0) {
                         if (allow_log_print)
-                            LogWarn("mkdir(%s) fail, errno:%d, %s", trimmed_dir_path.c_str(), errno, strerror(errno));
+                            LogNotice("mkdir(%s) fail, errno:%d, %s", trimmed_dir_path.c_str(), errno, strerror(errno));
                         return false;
                     }
                 } else {    //! 如果是其它的错误
                     if (allow_log_print)
-                        LogWarn("stat(%s) fail, errno:%d, %s", trimmed_dir_path.c_str(), errno, strerror(errno));
+                        LogNotice("stat(%s) fail, errno:%d, %s", trimmed_dir_path.c_str(), errno, strerror(errno));
                     return false;
                 }
             } else {    //! 如果 trimmed_dir_path 指定的inode存在
                 if (!S_ISDIR(sb.st_mode)) {  //! 该inode并不是一个目录
                     if (allow_log_print)
-                        LogWarn("inode %s is not directory", trimmed_dir_path.c_str());
+                        LogNotice("inode %s is not directory", trimmed_dir_path.c_str());
                     return false;
                 }
                 //! 存在，且是目录，则不做任何事件
@@ -315,9 +315,9 @@ bool RemoveDirectory(const std::string &dir, bool is_remove_file_only)
     if (dp == nullptr) {
         // 无法打开目录，直接结束
         if (errno == ENOENT) {
-            LogWarn("directory %s does not exist", dir.c_str());
+            LogNotice("directory %s does not exist", dir.c_str());
         } else {
-            LogWarn("open directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));
+            LogNotice("open directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));
         }
         return false;
     }
@@ -346,21 +346,21 @@ bool RemoveDirectory(const std::string &dir, bool is_remove_file_only)
             } else {
                 // 属性为文件，直接删除文件
                 if (::remove(full_path.c_str())) {
-                    LogWarn("removing file %s fail, errno:%d, %s", full_path.c_str(), errno, strerror(errno));
+                    LogNotice("removing file %s fail, errno:%d, %s", full_path.c_str(), errno, strerror(errno));
                     is_all_removed = false;
                 }
             }
         } else {
             // 无法获取属性，直接结束
-            LogWarn("getting state of %s fail, errno:%d, %s", full_path.c_str(), errno, strerror(errno));
+            LogNotice("getting state of %s fail, errno:%d, %s", full_path.c_str(), errno, strerror(errno));
             is_all_removed = false;
         }
     }
 
     if (!is_remove_file_only) {
        // 最后删除目录
        if (::rmdir(dir.c_str())) {
-            LogWarn("removing directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));
+            LogNotice("removing directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));
             is_all_removed = false;
         }
     }
@@ -374,9 +374,9 @@ bool ListDirectory(const std::string &dir, std::vector<std::string> &names)
     if (dp == nullptr) {
         // 无法打开目录，直接结束
         if (errno == ENOENT) {
-            LogWarn("directory %s does not exist", dir.c_str());
+            LogNotice("directory %s does not exist", dir.c_str());
         } else {
-            LogWarn("open directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));
+            LogNotice("open directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));
         }
         return false;
     }
@@ -492,7 +492,7 @@ bool Rename(const std::string &old_name, const std::string &new_name)
     if (ret == 0)
         return true;
 
-    LogWarn("rename '%s' to '%s' fail, errno:%d (%s)",
+    LogNotice("rename '%s' to '%s' fail, errno:%d (%s)",
             old_name.c_str(), new_name.c_str(), errno, strerror(errno));
     return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -116,5 +116,11 @@ void AbnormalExit()`
`116`	`116`	`std::abort();`
`117`	`117`	`}`
`118`	`118`
	`119`	`+void RaiseStopSignal()`
	`120`	`+{`
	`121`	`+ LogImportant("App want to stop process");`
	`122`	`+ ::raise(SIGTERM);`
	`123`	`+}`
	`124`	`+`
`119`	`125`	`}`
`120`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,10 +73,10 @@ bool ReadStringFromTextFile(const std::string &filename, std::string &content)`
`73`	`73`	`std::istreambuf_iterator<char>());`
`74`	`74`	`return true;`
`75`	`75`	`} else {`
`76`		`- LogWarn("open failed, %s", filename.c_str());`
	`76`	`+ LogNotice("open failed, %s", filename.c_str());`
`77`	`77`	`}`
`78`	`78`	`} catch (const exception &e) {`
`79`		`- LogWarn("catch exception: %s", e.what());`
	`79`	`+ LogNotice("catch exception: %s", e.what());`
`80`	`80`	`}`
`81`	`81`	`return false;`
`82`	`82`	`}`
`@@ -94,10 +94,10 @@ bool ReadEachLineFromTextFile(const std::string &filename, const std::function<v`
`94`	`94`	`}`
`95`	`95`	`return true;`
`96`	`96`	`} else {`
`97`		`- LogWarn("open failed, %s", filename.c_str());`
	`97`	`+ LogNotice("open failed, %s", filename.c_str());`
`98`	`98`	`}`
`99`	`99`	`} catch (const exception &e) {`
`100`		`- LogWarn("catch exception: %s", e.what());`
	`100`	`+ LogNotice("catch exception: %s", e.what());`
`101`	`101`	`}`
`102`	`102`	`return false;`
`103`	`103`	`}`
`@@ -115,10 +115,10 @@ bool ReadAllLinesFromTextFile(const std::string &filename, std::vector<std::stri`
`115`	`115`	`}`
`116`	`116`	`return true;`
`117`	`117`	`} else {`
`118`		`- LogWarn("open failed, %s", filename.c_str());`
	`118`	`+ LogNotice("open failed, %s", filename.c_str());`
`119`	`119`	`}`
`120`	`120`	`} catch (const exception &e) {`
`121`		`- LogWarn("catch exception: %s", e.what());`
	`121`	`+ LogNotice("catch exception: %s", e.what());`
`122`	`122`	`}`
`123`	`123`	`return false;`
`124`	`124`	`}`
`@@ -133,10 +133,10 @@ bool ReadFirstLineFromTextFile(const std::string &filename, std::string &text)`
`133`	`133`	`text.pop_back();`
`134`	`134`	`return true;`
`135`	`135`	`} else {`
`136`		`- LogWarn("open failed, %s", filename.c_str());`
	`136`	`+ LogNotice("open failed, %s", filename.c_str());`
`137`	`137`	`}`
`138`	`138`	`} catch (const exception &e) {`
`139`		`- LogWarn("catch exception: %s", e.what());`
	`139`	`+ LogNotice("catch exception: %s", e.what());`
`140`	`140`	`}`
`141`	`141`	`return false;`
`142`	`142`	`}`
`@@ -181,12 +181,12 @@ bool WriteFile(const char filename, const void data_ptr, size_t data_size, boo`
`181`	`181`	`return true;`
`182`	`182`
`183`	`183`	`if (wsize == -1)`
`184`		`- LogWarn("write errno:%d, %s", errno, strerror(errno));`
	`184`	`+ LogNotice("write errno:%d, %s", errno, strerror(errno));`
`185`	`185`	`else`
`186`		`- LogWarn("wsize:%d, size:%d", wsize, data_size);`
	`186`	`+ LogNotice("wsize:%d, size:%d", wsize, data_size);`
`187`	`187`
`188`	`188`	`} else`
`189`		`- LogWarn("open %s failed, %d, %s", filename, errno, strerror(errno));`
	`189`	`+ LogNotice("open %s failed, %d, %s", filename, errno, strerror(errno));`
`190`	`190`
`191`	`191`	`return false;`
`192`	`192`	`}`
`@@ -206,12 +206,12 @@ bool AppendFile(const char filename, const void data_ptr, size_t data_size, bo`
`206`	`206`	`return true;`
`207`	`207`
`208`	`208`	`if (wsize == -1)`
`209`		`- LogWarn("write errno:%d, %s", errno, strerror(errno));`
	`209`	`+ LogNotice("write errno:%d, %s", errno, strerror(errno));`
`210`	`210`	`else`
`211`		`- LogWarn("wsize:%d, size:%d", wsize, data_size);`
	`211`	`+ LogNotice("wsize:%d, size:%d", wsize, data_size);`
`212`	`212`
`213`	`213`	`} else`
`214`		`- LogWarn("open %s failed, %d, %s", filename, errno, strerror(errno));`
	`214`	`+ LogNotice("open %s failed, %d, %s", filename, errno, strerror(errno));`
`215`	`215`
`216`	`216`	`return false;`
`217`	`217`	`}`
`@@ -223,7 +223,7 @@ bool RemoveFile(const std::string &filename, bool allow_log_print)`
`223`	`223`	`return true;`
`224`	`224`
`225`	`225`	`if (errno != ENOENT && allow_log_print)`
`226`		`- LogWarn("errno:%d (%s)", errno, strerror(errno));`
	`226`	`+ LogNotice("errno:%d (%s)", errno, strerror(errno));`
`227`	`227`
`228`	`228`	`return false;`
`229`	`229`	`}`
`@@ -235,7 +235,7 @@ bool MakeSymbolLink(const std::string &old_path, const std::string &new_path, bo`
`235`	`235`	`return true;`
`236`	`236`
`237`	`237`	`if (allow_log_print)`
`238`		`- LogWarn("errno:%d (%s)", errno, strerror(errno));`
	`238`	`+ LogNotice("errno:%d (%s)", errno, strerror(errno));`
`239`	`239`	`return false;`
`240`	`240`	`}`
`241`	`241`
`@@ -246,7 +246,7 @@ bool MakeLink(const std::string &old_path, const std::string &new_path, bool all`
`246`	`246`	`return true;`
`247`	`247`
`248`	`248`	`if (allow_log_print)`
`249`		`- LogWarn("errno:%d (%s)", errno, strerror(errno));`
	`249`	`+ LogNotice("errno:%d (%s)", errno, strerror(errno));`
`250`	`250`	`return false;`
`251`	`251`	`}`
`252`	`252`
`@@ -259,7 +259,7 @@ bool MakeDirectory(const std::string &origin_dir_path, bool allow_log_print)`
`259`	`259`	`{`
`260`	`260`	`if (origin_dir_path.empty()) {`
`261`	`261`	`if (allow_log_print)`
`262`		`- LogWarn("origin_dir_path is empty");`
	`262`	`+ LogNotice("origin_dir_path is empty");`
`263`	`263`	`return false;`
`264`	`264`	`}`
`265`	`265`
`@@ -286,18 +286,18 @@ bool MakeDirectory(const std::string &origin_dir_path, bool allow_log_print)`
`286`	`286`	`if (errno == ENOENT) { //! 如果trimmed_dir_path指定的inode不存在，则创建目录`
`287`	`287`	`if (::mkdir(trimmed_dir_path.c_str(), 0775) != 0) {`
`288`	`288`	`if (allow_log_print)`
`289`		`- LogWarn("mkdir(%s) fail, errno:%d, %s", trimmed_dir_path.c_str(), errno, strerror(errno));`
	`289`	`+ LogNotice("mkdir(%s) fail, errno:%d, %s", trimmed_dir_path.c_str(), errno, strerror(errno));`
`290`	`290`	`return false;`
`291`	`291`	`}`
`292`	`292`	`} else { //! 如果是其它的错误`
`293`	`293`	`if (allow_log_print)`
`294`		`- LogWarn("stat(%s) fail, errno:%d, %s", trimmed_dir_path.c_str(), errno, strerror(errno));`
	`294`	`+ LogNotice("stat(%s) fail, errno:%d, %s", trimmed_dir_path.c_str(), errno, strerror(errno));`
`295`	`295`	`return false;`
`296`	`296`	`}`
`297`	`297`	`} else { //! 如果 trimmed_dir_path 指定的inode存在`
`298`	`298`	`if (!S_ISDIR(sb.st_mode)) { //! 该inode并不是一个目录`
`299`	`299`	`if (allow_log_print)`
`300`		`- LogWarn("inode %s is not directory", trimmed_dir_path.c_str());`
	`300`	`+ LogNotice("inode %s is not directory", trimmed_dir_path.c_str());`
`301`	`301`	`return false;`
`302`	`302`	`}`
`303`	`303`	`//! 存在，且是目录，则不做任何事件`
`@@ -315,9 +315,9 @@ bool RemoveDirectory(const std::string &dir, bool is_remove_file_only)`
`315`	`315`	`if (dp == nullptr) {`
`316`	`316`	`// 无法打开目录，直接结束`
`317`	`317`	`if (errno == ENOENT) {`
`318`		`- LogWarn("directory %s does not exist", dir.c_str());`
	`318`	`+ LogNotice("directory %s does not exist", dir.c_str());`
`319`	`319`	`} else {`
`320`		`- LogWarn("open directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));`
	`320`	`+ LogNotice("open directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));`
`321`	`321`	`}`
`322`	`322`	`return false;`
`323`	`323`	`}`
`@@ -346,21 +346,21 @@ bool RemoveDirectory(const std::string &dir, bool is_remove_file_only)`
`346`	`346`	`} else {`
`347`	`347`	`// 属性为文件，直接删除文件`
`348`	`348`	`if (::remove(full_path.c_str())) {`
`349`		`- LogWarn("removing file %s fail, errno:%d, %s", full_path.c_str(), errno, strerror(errno));`
	`349`	`+ LogNotice("removing file %s fail, errno:%d, %s", full_path.c_str(), errno, strerror(errno));`
`350`	`350`	`is_all_removed = false;`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`	`} else {`
`354`	`354`	`// 无法获取属性，直接结束`
`355`		`- LogWarn("getting state of %s fail, errno:%d, %s", full_path.c_str(), errno, strerror(errno));`
	`355`	`+ LogNotice("getting state of %s fail, errno:%d, %s", full_path.c_str(), errno, strerror(errno));`
`356`	`356`	`is_all_removed = false;`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`if (!is_remove_file_only) {`
`361`	`361`	`// 最后删除目录`
`362`	`362`	`if (::rmdir(dir.c_str())) {`
`363`		`- LogWarn("removing directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));`
	`363`	`+ LogNotice("removing directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));`
`364`	`364`	`is_all_removed = false;`
`365`	`365`	`}`
`366`	`366`	`}`
`@@ -374,9 +374,9 @@ bool ListDirectory(const std::string &dir, std::vector<std::string> &names)`
`374`	`374`	`if (dp == nullptr) {`
`375`	`375`	`// 无法打开目录，直接结束`
`376`	`376`	`if (errno == ENOENT) {`
`377`		`- LogWarn("directory %s does not exist", dir.c_str());`
	`377`	`+ LogNotice("directory %s does not exist", dir.c_str());`
`378`	`378`	`} else {`
`379`		`- LogWarn("open directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));`
	`379`	`+ LogNotice("open directory %s fail, errno:%d, %s", dir.c_str(), errno, strerror(errno));`
`380`	`380`	`}`
`381`	`381`	`return false;`
`382`	`382`	`}`
`@@ -492,7 +492,7 @@ bool Rename(const std::string &old_name, const std::string &new_name)`
`492`	`492`	`if (ret == 0)`
`493`	`493`	`return true;`
`494`	`494`
`495`		`- LogWarn("rename '%s' to '%s' fail, errno:%d (%s)",`
	`495`	`+ LogNotice("rename '%s' to '%s' fail, errno:%d (%s)",`
`496`	`496`	`old_name.c_str(), new_name.c_str(), errno, strerror(errno));`
`497`	`497`	`return false;`
`498`	`498`	`}`