fix: set log level at the beginning of the forge command

previously the log level was set within the generate function, as a result, the generator resolver used the wrong log level
ScottLogic · Mar 31, 2023 · 9a8958b · 9a8958b
1 parent cbd9524
commit 9a8958b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/forge/index.js b/src/forge/index.js
@@ -7,6 +7,7 @@ const {
   configToCommanderOptions,
   generatorOptionsPrefix,
 } = require("../generatorOptions/generatorOptions");
+const log = require("../common/log");
 
 const forgeCommand = function (program) {
   const command = program
@@ -36,7 +37,9 @@ const forgeCommand = function (program) {
       "1"
     )
     .allowUnknownOption()
-    .action(async (schema, generatorPathOrUrl) => {
+    .action(async (schema, generatorPathOrUrl, options) => {
+      log.setLogLevel(options.logLevel);
+
       const generatorPath = generatorResolver.getGenerator(generatorPathOrUrl);
       const configFile = path.join(generatorPath, "config.json");
 

diff --git a/src/generate.js b/src/generate.js
@@ -166,7 +166,6 @@ function getFilesInFolders(basePath, partialPath = "") {
 // IMPORTANT: This function is used in the generators, so be careful when modifying!
 // See issue https://github.com/ScottLogic/openapi-forge/issues/158
 async function generate(schemaPathOrUrl, generatorPathOrUrl, options) {
-  log.setLogLevel(options.logLevel);
   log.logTitle();
   let exception = null;
   let numberOfDiscoveredModels = 0;