Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

remove log url WEBPORTAL_URL prefix #5271

Merged
merged 2 commits into from
Feb 3, 2021
Merged

remove log url WEBPORTAL_URL prefix #5271

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f276190
remove log url prefix
Binyang2014 Jan 28, 2021
a3a5944
Merge branch 'master' into binyli/log-url
Binyang2014 Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/rest-server/src/models/v2/job/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const createError = require('@pai/utils/error');
const { encodeName } = require('@pai/models/v2/utils/name');

const LOG_MANAGER_PORT = process.env.LOG_MANAGER_PORT;
const WEBPORTAL_URL = process.env.WEBPORTAL_URL;

const constrcutLogManagerPrefix = (nodeIp) => {
return `http://${nodeIp}:${LOG_MANAGER_PORT}/api/v1`;
Expand Down Expand Up @@ -93,7 +92,7 @@ const getLogListFromLogManager = async (
const logList = res.data;

const ret = { locations: [] };
const urlPrefix = `${WEBPORTAL_URL}/log-manager/${nodeIp}:${LOG_MANAGER_PORT}`;
const urlPrefix = `/log-manager/${nodeIp}:${LOG_MANAGER_PORT}`;
const urlSuffix = tailMode === 'true' ? '&tail-mode=true' : '';
for (const key in logList) {
ret.locations.push({
Expand Down