9553336731

Committed 17 Jun 2024 07:08PM UTC coverage: 31.882% (+0.05%) from 31.837%

Build # 9553336731

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #9417 from ForumMagnum/master

[EA] Deploy analytics bugfix, search weights, comment sorting bugfix

Run Details

4823 of 39485 branches covered (12.21%)

Branch coverage included in aggregate %.

9 of 31 new or added lines in 9 files covered. (29.03%)

2 existing lines in 2 files now uncovered.

28072 of 63691 relevant lines covered (44.08%)

179.8 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

47.17

/packages/lesswrong/server/loadDatabaseSettings.ts

import { setPublicSettings, setServerSettingsCache } from '../lib/settingsCache';
import { DatabaseMetadataRepo } from "./repos";
import { getSqlClient } from './sql/sqlClient';
import { isAnyTest } from '../lib/executionEnvironment';

let databaseIdPreloaded = false;
let preloadedDatabaseId: string|null = null;
export const getPreloadedDatabaseId = () => {
  return {
    preloaded: databaseIdPreloaded,
    databaseId: preloadedDatabaseId
  };
}

type DatabaseSettings = {
  serverSettingsObject: DbDatabaseMetadata | null,
  publicSettingsObject: DbDatabaseMetadata | null,
  loadedDatabaseId: DbDatabaseMetadata | null,
}

const loadDatabaseSettingsPostgres = async (): Promise<DatabaseSettings> => {
  if (!isAnyTest) {
    // eslint-disable-next-line no-console
    console.log("Loading settings from Postgres...");
  }

  const repo = new DatabaseMetadataRepo();

  const [
    serverSettingsObject,
    publicSettingsObject,
    loadedDatabaseId,
  ] = await Promise.all([
    repo.getServerSettings(),
    repo.getPublicSettings(),
    repo.getDatabaseId(),
  ]);
  
  if (!isAnyTest && (!serverSettingsObject || !publicSettingsObject)) {
    // eslint-disable-next-line no-console
    console.error("Failed to load database settings from Postgres");
    // eslint-disable-next-line no-console
    if (!serverSettingsObject) console.error("No serverSettingsObject");
    // eslint-disable-next-line no-console
    if (!publicSettingsObject) console.error("No publicSettingsObject");
  }

  return {
    serverSettingsObject,
    publicSettingsObject,
    loadedDatabaseId,
  };
}

const loadDatabaseSettings = async (): Promise<DatabaseSettings> => {
  if (getSqlClient()) {
    try {
      // This needs to be awaited for it to be caught by the try/catch block
      return await loadDatabaseSettingsPostgres();
    } catch (e) {
      // eslint-disable-next-line no-console
      console.error("Failed to load database settings from Postgres", e);
    }
  }
  return {
    serverSettingsObject: null,
    publicSettingsObject: null,
    loadedDatabaseId: null,
  };
}

export const refreshSettingsCaches = async () => {
  const {
    serverSettingsObject,
    publicSettingsObject,
    loadedDatabaseId,
  } = await loadDatabaseSettings();

  databaseIdPreloaded = true;
  preloadedDatabaseId = loadedDatabaseId?.value;

  setServerSettingsCache(serverSettingsObject?.value || {__initialized: true});
  // We modify the publicSettings object that is made available in lib to allow both the client and the server to access it
  setPublicSettings(publicSettingsObject?.value || {__initialized: true});
}

1	import { setPublicSettings, setServerSettingsCache } from '../lib/settingsCache';	70✔
2	import { DatabaseMetadataRepo } from "./repos";	18✔
3	import { getSqlClient } from './sql/sqlClient';	18✔
4	import { isAnyTest } from '../lib/executionEnvironment';	18✔
5
6	let databaseIdPreloaded = false;	18✔
7	let preloadedDatabaseId: string\|null = null;	18✔
8	export const getPreloadedDatabaseId = () => {	18✔
9	return {	×
10	preloaded: databaseIdPreloaded,
11	databaseId: preloadedDatabaseId
12	};
13	}
14
15	type DatabaseSettings = {
16	serverSettingsObject: DbDatabaseMetadata \| null,
17	publicSettingsObject: DbDatabaseMetadata \| null,
18	loadedDatabaseId: DbDatabaseMetadata \| null,
19	}
20
21	const loadDatabaseSettingsPostgres = async (): Promise<DatabaseSettings> => {	18✔
22	if (!isAnyTest) {	×
23	// eslint-disable-next-line no-console
24	console.log("Loading settings from Postgres...");	×
25	}
26
27	const repo = new DatabaseMetadataRepo();	×
28
29	const [
30	serverSettingsObject,
31	publicSettingsObject,
32	loadedDatabaseId,
33	] = await Promise.all([	×
34	repo.getServerSettings(),
35	repo.getPublicSettings(),
36	repo.getDatabaseId(),
37	]);
38
39	if (!isAnyTest && (!serverSettingsObject \|\| !publicSettingsObject)) {	×
40	// eslint-disable-next-line no-console
41	console.error("Failed to load database settings from Postgres");	×
42	// eslint-disable-next-line no-console
43	if (!serverSettingsObject) console.error("No serverSettingsObject");	×
44	// eslint-disable-next-line no-console
45	if (!publicSettingsObject) console.error("No publicSettingsObject");	×
46	}
47
48	return {	×
49	serverSettingsObject,
50	publicSettingsObject,
51	loadedDatabaseId,
52	};
53	}
54
55	const loadDatabaseSettings = async (): Promise<DatabaseSettings> => {	18✔
56	if (getSqlClient()) {	16!
57	try {	×
58	// This needs to be awaited for it to be caught by the try/catch block
59	return await loadDatabaseSettingsPostgres();	×
60	} catch (e) {
61	// eslint-disable-next-line no-console
NEW 62	console.error("Failed to load database settings from Postgres", e);	×
63	}
64	}
65	return {	16✔
66	serverSettingsObject: null,
67	publicSettingsObject: null,
68	loadedDatabaseId: null,
69	};
70	}
71
72	export const refreshSettingsCaches = async () => {	18✔
73	const {
74	serverSettingsObject,
75	publicSettingsObject,
76	loadedDatabaseId,
77	} = await loadDatabaseSettings();	16✔
78
79	databaseIdPreloaded = true;	16✔
80	preloadedDatabaseId = loadedDatabaseId?.value;	16!
81
82	setServerSettingsCache(serverSettingsObject?.value \|\| {__initialized: true});	16!
83	// We modify the publicSettings object that is made available in lib to allow both the client and the server to access it
84	setPublicSettings(publicSettingsObject?.value \|\| {__initialized: true});	16!
85	}

ForumMagnum / ForumMagnum / 9553336731

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous