diff --git a/packages/deprecated/http/httpcall_tests.js b/packages/deprecated/http/httpcall_tests.js index f77f56bc49..20a3da63dc 100644 --- a/packages/deprecated/http/httpcall_tests.js +++ b/packages/deprecated/http/httpcall_tests.js @@ -467,7 +467,7 @@ if (Meteor.isServer) { function (test, expect) { // Suppress error printing for this test (and for any other code that sets // the x-suppress-error header). - WebApp.suppressExpressErrors(); + WebApp._suppressExpressErrors(); function do_test (path, code, match) { const prefix = Meteor.isModern diff --git a/packages/webapp/webapp.d.ts b/packages/webapp/webapp.d.ts index f701d4e893..6dbe152088 100644 --- a/packages/webapp/webapp.d.ts +++ b/packages/webapp/webapp.d.ts @@ -36,10 +36,14 @@ export declare module WebApp { var httpServer: http.Server; var expressApp: express.Application; /** - * @deprecated use suppressExpressErrors instead + * Should be used only for testing + * @deprecated use _suppressExpressErrors instead */ function suppressConnectErrors(): void; - function suppressExpressErrors(): void; + /** + * Should be used only for testing + */ + function _suppressExpressErrors(): void; function onListening(callback: Function): void; type RuntimeConfigHookCallback = (options: { diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index b7a0cbe058..6764d4ddaf 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -1349,6 +1349,8 @@ async function runWebAppServer() { suppressExpressErrors = true; }; + let warnedAboutConnectUsage = false; + // start up app _.extend(WebApp, { connectHandlers: packageAndAppHandlers, @@ -1358,8 +1360,14 @@ async function runWebAppServer() { httpServer: httpServer, expressApp: app, // For testing. - suppressConnectErrors: suppressErrors, - suppressExpressErrors: suppressErrors, + suppressConnectErrors: () => { + if (! warnedAboutConnectUsage) { + Meteor._debug("WebApp.suppressConnectErrors has been renamed to Meteor._suppressExpressErrors and it should be used only in tests."); + warnedAboutConnectUsage = true; + } + suppressErrors(); + }, + _suppressExpressErrors: suppressErrors, onListening: function(f) { if (onListeningCallbacks) onListeningCallbacks.push(f); else f();