fix: 处理require errors.js不存在的情况
This commit is contained in:
parent
8c642d79c2
commit
df8426d102
|
|
@ -39,7 +39,13 @@ function concat(...paths) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
async function startup(path, connector, omitWatchers, omitTimers, routine) {
|
async function startup(path, connector, omitWatchers, omitTimers, routine) {
|
||||||
const errorHandler = require((0, path_1.join)(path, 'lib', 'configuration', 'errors')).default;
|
let errorHandler = undefined;
|
||||||
|
try {
|
||||||
|
errorHandler = require((0, path_1.join)(path, 'lib', 'configuration', 'errors')).default;
|
||||||
|
}
|
||||||
|
catch (err) {
|
||||||
|
// 不存在errors配置
|
||||||
|
}
|
||||||
const serverConfiguration = require((0, path_1.join)(path, 'lib', 'configuration', 'server')).default;
|
const serverConfiguration = require((0, path_1.join)(path, 'lib', 'configuration', 'server')).default;
|
||||||
// 拿到package.json,用作项目的唯一标识,否则无法区分不同项目的Redis+socketIO连接
|
// 拿到package.json,用作项目的唯一标识,否则无法区分不同项目的Redis+socketIO连接
|
||||||
const packageJson = require((0, path_1.join)(path, 'package.json'));
|
const packageJson = require((0, path_1.join)(path, 'package.json'));
|
||||||
|
|
|
||||||
|
|
@ -57,12 +57,18 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
|
||||||
routine?: (context: AsyncContext<ED>) => Promise<void>,
|
routine?: (context: AsyncContext<ED>) => Promise<void>,
|
||||||
): Promise<(() => Promise<any>) | any> {
|
): Promise<(() => Promise<any>) | any> {
|
||||||
|
|
||||||
const errorHandler: ErrorHandler<ED> = require(join(
|
let errorHandler: ErrorHandler<ED> | undefined = undefined;
|
||||||
|
|
||||||
|
try {
|
||||||
|
errorHandler = require(join(
|
||||||
path,
|
path,
|
||||||
'lib',
|
'lib',
|
||||||
'configuration',
|
'configuration',
|
||||||
'errors'
|
'errors'
|
||||||
)).default;
|
)).default;
|
||||||
|
} catch (err) {
|
||||||
|
// 不存在errors配置
|
||||||
|
}
|
||||||
|
|
||||||
const serverConfiguration: ServerConfiguration = require(join(
|
const serverConfiguration: ServerConfiguration = require(join(
|
||||||
path,
|
path,
|
||||||
|
|
@ -218,7 +224,7 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
|
||||||
polyfillConsole("startup", true, (props) => {
|
polyfillConsole("startup", true, (props) => {
|
||||||
if (props.level === "error") {
|
if (props.level === "error") {
|
||||||
appLoader.execRoutine(async (ctx) => {
|
appLoader.execRoutine(async (ctx) => {
|
||||||
await errorHandler( props.caller, props.args, ctx);
|
await errorHandler(props.caller, props.args, ctx);
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
console.warn('执行全局错误处理失败:', err);
|
console.warn('执行全局错误处理失败:', err);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue