Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Disable the default timeout for requests on the LU build #4295

Merged
merged 13 commits into from
Nov 17, 2020
Merged

fix: Disable the default timeout for requests on the LU build #4295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
74bee7d
Fix #4294 - Disable the default timeout for requests on the LU build …
benbrown Sep 29, 2020
283ce29
Merge branch 'main' into benbrown/fix4294
benbrown Sep 29, 2020
527d6ca
Merge branch 'main' into benbrown/fix4294
benbrown Sep 29, 2020
4c4199d
Merge branch 'main' into benbrown/fix4294
cwhitten Oct 1, 2020
9a57d01
Merge branch 'main' into benbrown/fix4294
cwhitten Oct 13, 2020
8ed0402
Merge branch 'main' into benbrown/fix4294
benbrown Oct 14, 2020
649ac9f
Merge branch 'main' into benbrown/fix4294
cwhitten Oct 16, 2020
125989d
Merge branch 'main' into benbrown/fix4294
cwhitten Oct 30, 2020
cffffd3
Merge branch 'main' into benbrown/fix4294
cwhitten Nov 17, 2020
63de484
Merge branch 'main' into benbrown/fix4294
benbrown Nov 17, 2020
104d5c7
update mocked request object to contain settimeout
benbrown Nov 17, 2020
76a4d01
Merge branch 'benbrown/fix4294' of https://github.com/microsoft/BotFr…
benbrown Nov 17, 2020
ec026c7
Merge branch 'main' into benbrown/fix4294
cwhitten Nov 17, 2020
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
1 change: 1 addition & 0 deletions Composer/packages/server/src/controllers/__tests__/project.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ describe('publish luis files', () => {
crossTrainConfig: {},
luFiles: [],
},
setTimeout: (msecs: number, callback: () => any): void => {},
} as Request;
await ProjectController.build(mockReq, mockRes);
expect(mockRes.status).toHaveBeenCalled();
Expand Down
5 changes: 5 additions & 0 deletions Composer/packages/server/src/controllers/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,11 @@ async function build(req: Request, res: Response) {
const projectId = req.params.projectId;
const user = await ExtensionContext.getUserFromRequest(req);

// Disable Express' built in 2 minute timeout for requests. Otherwise, large models may fail to build.
req.setTimeout(0, () => {
throw new Error('LUIS publish process timed out.');
});

const currentProject = await BotProjectService.getProjectById(projectId, user);
if (currentProject !== undefined) {
try {
Expand Down