mirror of
https://github.com/cpvalente/ontime.git
synced 2026-08-24 00:19:21 +00:00
add retry count
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useForm } from 'react-hook-form';
|
||||
import { Switch } from '@chakra-ui/react';
|
||||
import { Input, Switch } from '@chakra-ui/react';
|
||||
import type { HttpSettings } from 'ontime-types';
|
||||
import { TimerLifeCycle } from 'ontime-types';
|
||||
|
||||
@@ -49,6 +49,7 @@ export default function HttpIntegration() {
|
||||
try {
|
||||
const newSettings: HttpSettings = {
|
||||
enabledOut: Boolean(values.enabledOut),
|
||||
retryCount: 0,
|
||||
subscriptions: {
|
||||
onLoad: values.subscriptions.onLoad ?? [],
|
||||
onStart: values.subscriptions.onStart ?? [],
|
||||
@@ -79,6 +80,14 @@ export default function HttpIntegration() {
|
||||
</div>
|
||||
<Switch {...register('enabledOut')} variant='ontime-on-light' />
|
||||
</div>
|
||||
<div className={styles.splitSection}>
|
||||
<div>
|
||||
<span className={`${styles.sectionTitle} ${styles.main}`}>Retry count</span>
|
||||
<span className={styles.sectionSubtitle}>How many times should the connection be retried</span>
|
||||
</div>
|
||||
<Input size='xs' variant='ontime-filled-on-light' autoComplete='off' {...register('retryCount')} />
|
||||
</div>
|
||||
|
||||
<HttpSubscriptionRow
|
||||
cycle={TimerLifeCycle.onLoad}
|
||||
title={sectionText.onLoad.title}
|
||||
|
||||
@@ -59,6 +59,7 @@ export const dbModel: DatabaseModel = {
|
||||
},
|
||||
http: {
|
||||
enabledOut: false,
|
||||
retryCount: 0,
|
||||
subscriptions: {
|
||||
onLoad: [],
|
||||
onStart: [],
|
||||
|
||||
@@ -17,7 +17,7 @@ type Action = TimerLifeCycleKey | string;
|
||||
export class HttpIntegration implements IIntegration<HttpSubscriptionOptions> {
|
||||
// protected httpAgent: null | http.Agent;
|
||||
subscriptions: HttpSubscription;
|
||||
|
||||
private retryCount = 0;
|
||||
constructor() {
|
||||
// this.httpAgent = null;
|
||||
this.subscriptions = dbModel.http.subscriptions;
|
||||
@@ -27,7 +27,9 @@ export class HttpIntegration implements IIntegration<HttpSubscriptionOptions> {
|
||||
* Initializes httpClient
|
||||
*/
|
||||
init(config: HttpSettings) {
|
||||
const { subscriptions, enabledOut } = config;
|
||||
const { subscriptions, enabledOut, retryCount } = config;
|
||||
|
||||
this.retryCount = retryCount;
|
||||
|
||||
if (!enabledOut) {
|
||||
// this.httpAgent?.destroy();
|
||||
@@ -102,12 +104,12 @@ export class HttpIntegration implements IIntegration<HttpSubscriptionOptions> {
|
||||
if (method === 'GET') {
|
||||
await got.get(path, {
|
||||
searchParams: options,
|
||||
retry: { limit: 0 },
|
||||
retry: { limit: this.retryCount },
|
||||
});
|
||||
} else if (method === 'POST') {
|
||||
await got.post(path, {
|
||||
body: options,
|
||||
retry: { limit: 0 },
|
||||
retry: { limit: this.retryCount },
|
||||
});
|
||||
}
|
||||
} catch (err) {
|
||||
|
||||
@@ -280,8 +280,11 @@ export const parseHttp = (data: { http?: Partial<HttpSettings> }): HttpSettings
|
||||
? loadedConfig.subscriptions
|
||||
: dbModel.http.subscriptions;
|
||||
|
||||
const retryCount = Math.max(0, loadedConfig.retryCount ?? dbModel.http.retryCount);
|
||||
|
||||
return {
|
||||
enabledOut: loadedConfig.enabledOut ?? dbModel.http.enabledOut,
|
||||
retryCount: retryCount,
|
||||
subscriptions: validatedSubscriptions,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user