Skip to content

Extend timeout when testrun is stopping #375

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

Merged
sofyakurilova merged 2 commits into from
Apr 10, 2024
Merged

Extend timeout when testrun is stopping #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b90b3d4
Extend timeout when testrun is stopping
sofyakurilova Apr 5, 2024
f6d663f
Increase interval
sofyakurilova Apr 10, 2024
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
20 changes: 15 additions & 5 deletions modules/ui/src/app/interceptors/error.interceptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,27 @@ import {
import { NotificationService } from '../services/notification.service';

import { SYSTEM_STOP } from '../services/test-run.service';
import { finalize } from 'rxjs/operators';

const DEFAULT_TIMEOUT_MS = 5000;
const SYSTEM_STOP_TIMEOUT_MS = 10000;
const SYSTEM_STOP_TIMEOUT_MS = 60 * 1000;

@Injectable()
export class ErrorInterceptor implements HttpInterceptor {
private isTestrunStop = false;
constructor(private notificationService: NotificationService) {}

intercept(
request: HttpRequest<unknown>,
next: HttpHandler,
timeoutMs = DEFAULT_TIMEOUT_MS
): Observable<HttpEvent<unknown>> {
const timeoutValue = request.url.includes(SYSTEM_STOP)
? SYSTEM_STOP_TIMEOUT_MS
: timeoutMs;
const timeoutValue =
request.url.includes(SYSTEM_STOP) || this.isTestrunStop
? SYSTEM_STOP_TIMEOUT_MS
: timeoutMs;
if (request.url.includes(SYSTEM_STOP)) {
this.isTestrunStop = true;
}
return next.handle(request).pipe(
timeout(timeoutValue),
catchError((error: HttpErrorResponse | TimeoutError) => {
Expand All @@ -66,6 +71,11 @@ export class ErrorInterceptor implements HttpInterceptor {
}
}
return throwError(error);
}),
finalize(() => {
if (request.url.includes(SYSTEM_STOP)) {
this.isTestrunStop = false;
}
})
);
}
Expand Down
9 changes: 5 additions & 4 deletions modules/ui/src/app/services/test-run.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,15 @@ export class TestRunService {
* @param isCancelling - indicates if status should be overridden with Cancelling value
*/
getSystemStatus(isCancelling?: boolean): void {
this.http
.get<TestrunStatus>(`${API_URL}/system/status`)
.subscribe((res: TestrunStatus) => {
this.http.get<TestrunStatus>(`${API_URL}/system/status`).subscribe(
(res: TestrunStatus) => {
if (isCancelling && res.status !== StatusOfTestrun.Cancelled) {
res.status = StatusOfTestrun.Cancelling;
}
this.setSystemStatus(res);
});
},
err => console.error('HTTP Error', err)
);
}

stopTestrun(): Observable<boolean> {
Expand Down