refactor: auto-cert handling logic #1095, #1104

Author: 0xJacky

.cursor/mcp.json

@@ -4,6 +4,10 @@
 			"command": "npx",
 			"args": ["@eslint/mcp@latest"],
 			"env": {}
-		}
+		},
+		"context7": {
+      "command": "npx",
+      "args": ["-y", "@upstash/context7-mcp"]
+    }
 	}
 }

api/certificate/issue.go

@@ -26,7 +26,7 @@ type IssueCertResponse struct {
 	Message           string             `json:"message"`
 	SSLCertificate    string             `json:"ssl_certificate,omitempty"`
 	SSLCertificateKey string             `json:"ssl_certificate_key,omitempty"`
-	KeyType           certcrypto.KeyType `json:"key_type"`
+	KeyType           certcrypto.KeyType `json:"key_type,omitempty"`
 }
 
 func IssueCert(c *gin.Context) {
@@ -71,28 +71,19 @@ func IssueCert(c *gin.Context) {
 		}
 	}
 
-	errChan := make(chan error, 1)
-
 	log := cert.NewLogger()
 	log.SetCertModel(&certModel)
 	log.SetWebSocket(ws)
 	defer log.Close()
 
-	go cert.IssueCert(payload, log, errChan)
-
-	// block, until errChan closes
-	if err := <-errChan; err != nil {
+	err = cert.IssueCert(payload, log)
+	if err != nil {
 		log.Error(err)
-		err = ws.WriteJSON(IssueCertResponse{
+		_ = ws.WriteJSON(IssueCertResponse{
 			Status:  Error,
 			Message: err.Error(),
 		})
-		if err != nil {
-			if helper.IsUnexpectedWebsocketError(err) {
-				logger.Error(err)
-			}
-			return
-		}
+		return
 	}
 
 	cert := query.Cert

api/cluster/nginx.go

@@ -39,7 +39,7 @@ func syncReload(nodeIDs []uint64) {
 				if err := recover(); err != nil {
 					buf := make([]byte, 1024)
 					runtime.Stack(buf, false)
-					logger.Error(err)
+					logger.Errorf("%s\n%s", err, buf)
 				}
 			}()
 			defer wg.Done()
@@ -93,7 +93,7 @@ func syncRestart(nodeIDs []uint64) {
 				if err := recover(); err != nil {
 					buf := make([]byte, 1024)
 					runtime.Stack(buf, false)
-					logger.Error(err)
+					logger.Errorf("%s\n%s", err, buf)
 				}
 			}()
 			defer wg.Done()

api/nginx_log/websocket.go

@@ -67,7 +67,7 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch
 		if err := recover(); err != nil {
 			buf := make([]byte, 1024)
 			runtime.Stack(buf, false)
-			logger.Error(err)
+			logger.Errorf("%s\n%s", err, buf)
 			return
 		}
 	}()
@@ -139,7 +139,7 @@ func handleLogControl(ws *websocket.Conn, controlChan chan controlStruct, errCha
 		if err := recover(); err != nil {
 			buf := make([]byte, 1024)
 			runtime.Stack(buf, false)
-			logger.Error(err)
+			logger.Errorf("%s\n%s", err, buf)
 			return
 		}
 	}()