From 2c79f3544e9024db763605f67cdd2cc58a1655d3 Mon Sep 17 00:00:00 2001 From: Andre Wanlin Date: Wed, 25 Oct 2023 06:38:24 -0500 Subject: [PATCH] Reverted changes based on feedback Signed-off-by: Andre Wanlin --- .../default-app/packages/backend/src/index.ts | 15 ++++++++------- .../packages/backend/src/plugins/search.ts.hbs | 3 +++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/create-app/templates/default-app/packages/backend/src/index.ts b/packages/create-app/templates/default-app/packages/backend/src/index.ts index abd39502d7..04c4ff9392 100644 --- a/packages/create-app/templates/default-app/packages/backend/src/index.ts +++ b/packages/create-app/templates/default-app/packages/backend/src/index.ts @@ -11,6 +11,7 @@ import { createServiceBuilder, loadBackendConfig, getRootLogger, + useHotMemoize, notFoundHandler, CacheManager, DatabaseManager, @@ -77,13 +78,13 @@ async function main() { }); const createEnv = makeCreateEnv(config); - const catalogEnv = createEnv('catalog'); - const scaffolderEnv = createEnv('scaffolder'); - const authEnv = createEnv('auth'); - const proxyEnv = createEnv('proxy'); - const techdocsEnv = createEnv('techdocs'); - const searchEnv = createEnv('search'); - const appEnv = createEnv('app'); + const catalogEnv = useHotMemoize(module, () => createEnv('catalog')); + const scaffolderEnv = useHotMemoize(module, () => createEnv('scaffolder')); + const authEnv = useHotMemoize(module, () => createEnv('auth')); + const proxyEnv = useHotMemoize(module, () => createEnv('proxy')); + const techdocsEnv = useHotMemoize(module, () => createEnv('techdocs')); + const searchEnv = useHotMemoize(module, () => createEnv('search')); + const appEnv = useHotMemoize(module, () => createEnv('app')); const apiRouter = Router(); apiRouter.use('/catalog', await catalog(catalogEnv)); diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts.hbs b/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts.hbs index a2551a7bae..467ac60a5a 100644 --- a/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts.hbs +++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts.hbs @@ -1,3 +1,4 @@ +import { useHotCleanup } from '@backstage/backend-common'; import { createRouter } from '@backstage/plugin-search-backend'; import { IndexBuilder, @@ -53,6 +54,8 @@ export default async function createPlugin( const { scheduler } = await indexBuilder.build(); scheduler.start(); + useHotCleanup(module, () => scheduler.stop()); + return await createRouter({ engine: indexBuilder.getSearchEngine(), types: indexBuilder.getDocumentTypes(),