feat: 便携版启动引擎新添参数--disable-output

yaklang · Dec 11, 2023 · a135932 · a135932
1 parent a2b2cb4
commit a135932
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/app/main/handlers/engineStatus.js b/app/main/handlers/engineStatus.js
@@ -162,18 +162,19 @@ module.exports = (win, callback, getClient, newClient) => {
      * @param {Object} params
      * @param {Boolean} params.sudo 是否使用管理员权限启动yak
      * @param {Number} params.port 本地缓存数据里的引擎启动端口号
+     * @param {Boolean} params.isEnpriTraceAgent 本地缓存数据里的引擎启动端口号
      */
     const asyncStartLocalYakEngineServer = (win, params) => {
         engineCount += 1
 
-        const { sudo, port } = params
+        const { sudo, port,isEnpriTraceAgent } = params
         return new Promise((resolve, reject) => {
             try {
                 // 考虑如果管理员权限启动未成功该通过什么方式自启普通权限引擎进程
                 if (sudo) {
                     if (isWindows) {
                         const subprocess = childProcess.exec(
-                            generateWindowsSudoCommand(getLocalYaklangEngine(), `grpc --port ${port}${dbFile ? " --profile-db " + dbFile : ""}`),
+                            generateWindowsSudoCommand(getLocalYaklangEngine(), `grpc --port ${port}${dbFile ? " --profile-db " + dbFile : ""}${isEnpriTraceAgent?` --disable-output`:""}`),
                             {
                                 maxBuffer: 1000 * 1000 * 1000,
                                 stdio: "pipe",
@@ -190,7 +191,7 @@ module.exports = (win, callback, getClient, newClient) => {
                         })
                         resolve()
                     } else {
-                        const cmd = `${getLocalYaklangEngine()} grpc --port ${port}${dbFile ? ` --profile-db ${dbFile}` : ""}`
+                        const cmd = `${getLocalYaklangEngine()} grpc --port ${port}${dbFile ? ` --profile-db ${dbFile}` : ""}${isEnpriTraceAgent?` --disable-output`:""}`
                         sudoExec(
                             cmd,
                             {
@@ -211,8 +212,9 @@ module.exports = (win, callback, getClient, newClient) => {
 
                     const grpcPort = ["grpc", "--port", `${port}`]
                     const extraParams = dbFile ? [...grpcPort, "--profile-db", dbFile] : grpcPort
+                    const resultParams = isEnpriTraceAgent? [...extraParams, "--disable-output"]:extraParams
 
-                    const subprocess = childProcess.spawn(getLocalYaklangEngine(), extraParams, {
+                    const subprocess = childProcess.spawn(getLocalYaklangEngine(), resultParams, {
                         // stdio: ["ignore", "ignore", "ignore"]
                         detached: false, windowsHide: true,
                         stdio: ["ignore", log, log]

diff --git a/app/renderer/src/main/src/components/basics/YakitLoading.tsx b/app/renderer/src/main/src/components/basics/YakitLoading.tsx
@@ -237,7 +237,8 @@ export const YakitLoading: React.FC<YakitLoadingProp> = (props) => {
             ipcRenderer
                 .invoke("start-local-yaklang-engine", {
                     port: props.localPort,
-                    sudo: false
+                    sudo: false,
+                    isEnpriTraceAgent:isEnpriTraceAgent()
                 })
                 .then(() => {
                     outputToWelcomeConsole("手动引擎启动成功！")
@@ -345,7 +346,8 @@ export const YakitLoading: React.FC<YakitLoadingProp> = (props) => {
         ipcRenderer
         .invoke("start-local-yaklang-engine", {
             port: props.localPort,
-            sudo: false
+            sudo: false,
+            isEnpriTraceAgent:isEnpriTraceAgent()
         })
         .then(() => {
             outputToWelcomeConsole("手动引擎启动成功！")
@@ -661,7 +663,8 @@ export const YakitControlLoading: React.FC<YakitControlLoadingProp> = (props) =>
         ipcRenderer
         .invoke("start-local-yaklang-engine", {
             port: localPort,
-            sudo: false
+            sudo: false,
+            isEnpriTraceAgent:isEnpriTraceAgent()
         })
         .then(() => {
             outputToWelcomeConsole("手动引擎启动成功！")

diff --git a/app/renderer/src/main/src/components/layout/YaklangEngineWatchDog.tsx b/app/renderer/src/main/src/components/layout/YaklangEngineWatchDog.tsx
@@ -8,6 +8,7 @@ import {getRemoteValue, setRemoteValue} from "@/utils/kv"
 import {RemoteGV} from "@/yakitGV"
 import { useStore, yakitDynamicStatus } from "@/store"
 import { remoteOperation } from "@/pages/dynamicControl/DynamicControl"
+import { isEnpriTraceAgent } from "@/utils/envfile"
 
 export interface YaklangEngineWatchDogCredential {
     Mode?: YaklangEngineMode
@@ -161,7 +162,8 @@ export const YaklangEngineWatchDog: React.FC<YaklangEngineWatchDogProps> = React
                         ipcRenderer
                             .invoke("start-local-yaklang-engine", {
                                 port: props.credential.Port,
-                                sudo: isAdmin
+                                sudo: isAdmin,
+                                isEnpriTraceAgent:isEnpriTraceAgent()
                             })
                             .then(() => {
                                 outputToWelcomeConsole("引擎启动成功！")