Optimize bug report message (#4368)

* update

* update

* update

* Revert "update"

This reverts commit cc2c580.

* update

* update

* Delete useless code

* update

* update

* Update base.cc

Co-authored-by: 韩天峰-Rango <[email protected]>

Author: zmyWL

ext-src/php_swoole.cc

@@ -418,6 +418,13 @@ static void fatal_error(int code, const char *format, ...) {
     zend_end_try();
 }
 
+static void bug_report_message_init() {
+    SwooleG.bug_report_message += swoole::std_string::format(
+        "PHP_VERSION : %s\n",
+        PHP_VERSION
+    );
+}
+
 /* {{{ PHP_MINIT_FUNCTION
  */
 PHP_MINIT_FUNCTION(swoole) {
@@ -745,6 +752,9 @@ PHP_MINIT_FUNCTION(swoole) {
     }
 
     swoole_init();
+
+    // init bug report message
+    bug_report_message_init();
     if (strcmp("cli", sapi_module.name) == 0 || strcmp("phpdbg", sapi_module.name) == 0) {
         SWOOLE_G(cli) = 1;
     }

include/swoole.h

@@ -666,6 +666,9 @@ struct Global {
     //-----------------------[Hook]--------------------------
     void *hooks[SW_MAX_HOOK_TYPE];
     std::function<bool(Reactor *reactor, int &event_num)> user_exit_condition;
+
+    // bug report message
+    std::string bug_report_message = "";
 };
 
 std::string dirname(const std::string &file);

include/swoole_ssl.h

@@ -33,6 +33,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/rand.h>
+#include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
 #define SW_SUPPORT_DTLS
@@ -169,5 +170,6 @@ void swoole_ssl_server_http_advise(swoole::SSLContext &);
 const char *swoole_ssl_get_error();
 int swoole_ssl_get_ex_connection_index();
 int swoole_ssl_get_ex_port_index();
+std::string swoole_ssl_get_version_message();
 
 #endif

src/core/base.cc

@@ -41,6 +41,7 @@
 #include "swoole_async.h"
 #include "swoole_c_api.h"
 #include "swoole_coroutine_c_api.h"
+#include "swoole_ssl.h"
 
 using swoole::String;
 
@@ -110,6 +111,30 @@ void *sw_realloc(void *ptr, size_t size) {
     return SwooleG.std_allocator.realloc(ptr, size);
 }
 
+static void bug_report_message_init() {
+    SwooleG.bug_report_message += "\n" + std::string(SWOOLE_BUG_REPORT) + "\n";
+
+    struct utsname u;
+    if (uname(&u) != -1) {
+        SwooleG.bug_report_message += swoole::std_string::format(
+            "OS: %s %s %s %s\n",
+            u.sysname,
+            u.release,
+            u.version,
+            u.machine);
+    }
+
+#ifdef __VERSION__
+    SwooleG.bug_report_message += swoole::std_string::format(
+        "GCC_VERSION: %s\n",
+        __VERSION__);
+#endif
+
+#ifdef SW_USE_OPENSSL
+    SwooleG.bug_report_message += swoole_ssl_get_version_message();
+
+#endif
+}
 void swoole_init(void) {
     if (SwooleG.init) {
         return;
@@ -169,6 +194,9 @@ void swoole_init(void) {
     SwooleG.use_signalfd = 1;
     SwooleG.enable_signalfd = 1;
 #endif
+
+    // init bug report message
+    bug_report_message_init();
 }
 
 SW_EXTERN_C_BEGIN

src/os/process_pool.cc

@@ -704,7 +704,7 @@ int ProcessPool::wait() {
                        exit_worker->id,
                        exit_status.get_code(),
                        exit_status.get_signal(),
-                       exit_status.get_signal() == SIGSEGV ? "\n" SWOOLE_BUG_REPORT : "");
+                       exit_status.get_signal() == SIGSEGV ? SwooleG.bug_report_message.c_str() : "");
             }
             new_pid = spawn(exit_worker);
             if (new_pid < 0) {

src/protocol/ssl.cc

@@ -18,6 +18,7 @@
 #include "swoole_string.h"
 #include "swoole_socket.h"
 #include "swoole_ssl.h"
+#include "swoole_util.h"
 
 #ifdef SW_USE_OPENSSL
 
@@ -54,6 +55,14 @@ static int swoole_ssl_verify_cookie(SSL *ssl, const uchar *cookie, uint cookie_l
 #define MAYBE_UNUSED
 #endif
 
+std::string swoole_ssl_get_version_message() {
+    std::string message = swoole::std_string::format(
+        "OPENSSL_VERSION: %s\n",
+        OPENSSL_VERSION_TEXT);
+
+    return message;
+}
+
 static void MAYBE_UNUSED swoole_ssl_lock_callback(int mode, int type, const char *file, int line);
 
 void swoole_ssl_init(void) {

src/server/manager.cc

@@ -209,7 +209,7 @@ void Server::check_worker_exit_status(int worker_id, const ExitStatus &exit_stat
                worker_id,
                exit_status.get_code(),
                exit_status.get_signal(),
-               exit_status.get_signal() == SIGSEGV ? "\n" SWOOLE_BUG_REPORT : "");
+               exit_status.get_signal() == SIGSEGV ? SwooleG.bug_report_message.c_str() : "");
         if (onWorkerError != nullptr) {
             onWorkerError(this, worker_id, exit_status);
         }