提交 7d1930ac 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

kill ztf process

上级 93ffb047
import {app, BrowserWindow} from 'electron';
import {getUIServerUrl, startZtfServer, killZtfServer} from './service';
import {logInfo, logErr} from './log';
import {killPortProcess} from "kill-port-process";
import {portClient, portServer} from "./consts";
// Handle creating/removing shortcuts on Windows when installing/uninstalling.
if (require('electron-squirrel-startup')) { // eslint-disable-line global-require
......@@ -34,6 +36,7 @@ async function startApp() {
_starting = true;
try {
await killPortProcess([portClient, portServer])
const ztfServerUrl = await startZtfServer();
logInfo(`>> ZTF Server started successfully: ${ztfServerUrl}`);
} catch (error) {
......
......@@ -4,7 +4,6 @@ import os from 'os';
import {app} from 'electron';
import express from 'express';
const psTree = require('ps-tree');
const { killPortProcess } = require('kill-port-process');
import {portClient, portServer, uuid} from './consts';
import {logInfo, logErr} from './log';
......@@ -17,10 +16,6 @@ let _ztfServerProcess;
let _ztfSubProcessIds = [];
export function startZtfServer() {
(async () => {
await killPortProcess([portClient, portServer])
})();
if (process.env.SKIP_SERVER) {
logInfo(`>> Skip to start ZTF Server by env "SKIP_SERVER=${process.env.SKIP_SERVER}".`);
return Promise.resolve();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册