Oak-Team
/
oak-cli
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 19 Wiki Activity

调整了socket path路径

This commit is contained in:
wkj 2024-04-25 19:24:08 +08:00
parent 46cf0e9ab2
commit dfe86166c8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/server/start.js
View File

@ -144,7 +144,7 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) {
if (nginx.port) { if (nginx.port) {
url += `:${nginx.port}`; url += `:${nginx.port}`;
} }
url = concat(url, `${nginx.socketPath}`); // url = concat(url, `/${nginx.socketPath}`);
} }
else if (clusterInfo.usingCluster) { else if (clusterInfo.usingCluster) {
url += `:${process.env.PM2_PORT || 8080}`; url += `:${process.env.PM2_PORT || 8080}`;
@ -153,11 +153,12 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) {
url += `:${port}`; url += `:${port}`;
} }
url = concat(url, DATA_SUBSCRIBER_NAMESPACE); url = concat(url, DATA_SUBSCRIBER_NAMESPACE);
// 配置nginx的socketPath 需加在path上
router.get(connector.getSubscribePointRouter(), async (ctx) => { router.get(connector.getSubscribePointRouter(), async (ctx) => {
const { response } = ctx; const { response } = ctx;
response.body = { response.body = {
url, url,
path: connector.getSubscribeRouter(), path: nginx?.socketPath ? `/${nginx.socketPath}` : '' + connector.getSubscribeRouter(),
}; };
return; return;
}); });

5
src/server/start.ts
View File

@ -164,7 +164,7 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
if (nginx.port) { if (nginx.port) {
url += `:${nginx.port}`; url += `:${nginx.port}`;
} }
url = concat(url, `${nginx.socketPath}`); // url = concat(url, `/${nginx.socketPath}`);
} }
else if (clusterInfo.usingCluster){ else if (clusterInfo.usingCluster){
url += `:${process.env.PM2_PORT || 8080}`; url += `:${process.env.PM2_PORT || 8080}`;
@ -173,11 +173,12 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
url += `:${port}`; url += `:${port}`;
} }
url = concat(url, DATA_SUBSCRIBER_NAMESPACE); url = concat(url, DATA_SUBSCRIBER_NAMESPACE);
// 配置nginx的socketPath 需加在path上
router.get(connector.getSubscribePointRouter(), async (ctx) => { router.get(connector.getSubscribePointRouter(), async (ctx) => {
const { response } = ctx; const { response } = ctx;
response.body = { response.body = {
url, url,
path: connector.getSubscribeRouter(), path: nginx?.socketPath ? `/${nginx.socketPath}` : '' + connector.getSubscribeRouter(),
}; };
return; return;
}); });