From 16f84ba3d3fdfe08a4ab556cf16ce056cf30cb92 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Fri, 8 Apr 2022 23:59:57 -0400
Subject: [PATCH] plugins: Move plugin logging to `plugins.update()`

---
 src/node/server.js                | 8 --------
 src/static/js/pluginfw/plugins.js | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/node/server.js b/src/node/server.js
index ae6cacb44..15c802c34 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -48,7 +48,6 @@ const UpdateCheck = require('./utils/UpdateCheck');
 const db = require('./db/DB');
 const express = require('./hooks/express');
 const hooks = require('../static/js/pluginfw/hooks');
-const pluginDefs = require('../static/js/pluginfw/plugin_defs');
 const plugins = require('../static/js/pluginfw/plugins');
 const {Gate} = require('./utils/promises');
 const stats = require('./stats');
@@ -134,13 +133,6 @@ exports.start = async () => {
 
     await db.init();
     await plugins.update();
-    const installedPlugins = Object.values(pluginDefs.plugins)
-        .filter((plugin) => plugin.package.name !== 'ep_etherpad-lite')
-        .map((plugin) => `${plugin.package.name}@${plugin.package.version}`)
-        .join(', ');
-    logger.info(`Installed plugins: ${installedPlugins}`);
-    logger.debug(`Installed parts:\n${plugins.formatParts()}`);
-    logger.debug(`Installed server-side hooks:\n${plugins.formatHooks('hooks', false)}`);
     await hooks.aCallAll('loadSettings', {settings});
     await hooks.aCallAll('createServer');
   } catch (err) {
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index ec3cfaa92..2317168f7 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -102,6 +102,13 @@ exports.update = async () => {
     const logger = log4js.getLogger(`plugin:${p}`);
     await hooks.aCallAll(`init_${p}`, {logger});
   }));
+  const installedPlugins = Object.values(defs.plugins)
+      .filter((plugin) => plugin.package.name !== 'ep_etherpad-lite')
+      .map((plugin) => `${plugin.package.name}@${plugin.package.version}`)
+      .join(', ');
+  logger.info(`Installed plugins: ${installedPlugins}`);
+  logger.debug(`Installed parts:\n${exports.formatParts()}`);
+  logger.debug(`Installed server-side hooks:\n${exports.formatHooks('hooks', false)}`);
 };
 
 exports.getPackages = async () => {