xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't send rageshakes or start sentry if we don't have config for them

Browse source
This commit is contained in:
David Baker 2022-12-21 09:42:27 +00:00
parent fd3c0d9fc6
commit eaf14a0562
2 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/initializer.tsx
View file

@ -191,17 +191,24 @@ export class Initializer {
this.loadStates.sentry === LoadState.None &&
this.loadStates.config === LoadState.Loaded
) {
Sentry.init({
dsn: Config.instance.config.sentry?.DSN,
environment: Config.instance.config.sentry?.environment,
integrations: [
new Integrations.BrowserTracing({
routingInstrumentation:
Sentry.reactRouterV5Instrumentation(history),
}),
],
tracesSampleRate: 1.0,
});
if (
Config.instance.config.sentry?.DSN &&
Config.instance.config.sentry?.environment
) {
Sentry.init({
dsn: Config.instance.config.sentry?.DSN,
environment: Config.instance.config.sentry?.environment,
integrations: [
new Integrations.BrowserTracing({
routingInstrumentation:
Sentry.reactRouterV5Instrumentation(history),
}),
],
tracesSampleRate: 1.0,
});
}
// Sentry is now 'loadeed' (even if we actually skipped starting
// it due to to not being configured)
this.loadStates.sentry = LoadState.Loaded;
}

16
src/settings/submit-rageshake.ts
View file

@ -54,6 +54,10 @@ export function useSubmitRageshake(): {
const submitRageshake = useCallback(
async (opts) => {
if (!Config.instance.config.rageshake?.submit_url) {
throw new Error("No rageshake URL is configured");
}
if (sending) {
return;
}
@ -258,14 +262,10 @@ export function useSubmitRageshake(): {
);
}
await fetch(
Config.instance.config.rageshake?.submit_url ??
DEFAULT_CONFIG.rageshake.submit_url,
{
method: "POST",
body,
}
);
await fetch(Config.instance.config.rageshake?.submit_url, {
method: "POST",
body,
});
setState({ sending: false, sent: true, error: null });
} catch (error) {