[INTERNAL] Logger: Change order of log-flags

The dedicated log-level flag should always overwrite the other log-level
flags.

Author: RandomByte

lib/cli/base.js

@@ -17,20 +17,21 @@ export default function(cli) {
 			alias: "log-level",
 			describe: "Set the logging level (silent|error|warn|info|perf|verbose|silly).",
 			default: "info",
-			type: "string"
+			type: "string",
+			choices: ["silent", "error", "warn", "info", "perf", "verbose", "silly"]
 		})
 		.option("verbose", {
 			describe: "Enable verbose logging.",
 			default: false,
 			type: "boolean"
 		})
-		.option("silent", {
-			describe: "Disable all log output.",
+		.option("perf", {
+			describe: "Enable performance measurements and related logging.",
 			default: false,
 			type: "boolean"
 		})
-		.option("perf", {
-			describe: "Enable performance measurements and related logging.",
+		.option("silent", {
+			describe: "Disable all log output.",
 			default: false,
 			type: "boolean"
 		})

lib/cli/middlewares/logger.js

@@ -7,21 +7,20 @@ import {getVersion} from "../version.js";
  * @param {object} argv logger arguments
  */
 export async function initLogger(argv) {
-	if (argv.loglevel && argv.loglevel !== "info") {
-		// argv.loglevel defaults to "info", which is anyways already the Logger's default
-		// Therefore do not explicitly set it again in order to allow overwriting the log level
-		// using the UI5_LOG_LVL environment variable
-		setLogLevel(argv.loglevel);
+	if (argv.silent) {
+		setLogLevel("silent");
 	}
 	if (argv.perf) {
 		setLogLevel("perf");
 	}
 	if (argv.verbose) {
 		setLogLevel("verbose");
 	}
-	if (argv.silent) {
-		// Silent should overrule any other log-level related CLI flags
-		setLogLevel("silent");
+	if (argv.loglevel && argv.loglevel !== "info") {
+		// argv.loglevel defaults to "info", which is anyways already the Logger's default
+		// Therefore do not explicitly set it again in order to allow overwriting the log level
+		// using the UI5_LOG_LVL environment variable
+		setLogLevel(argv.loglevel);
 	}
 
 	// Initialize writer

test/lib/cli/middlewares/logger.js

@@ -75,18 +75,18 @@ test.serial("With log-level and verbose flag", async (t) => {
 	const {logger, setLogLevelStub} = t.context;
 	await logger.initLogger({loglevel: "silly", verbose: true});
 	t.is(setLogLevelStub.callCount, 2, "setLevel has been called twice");
-	t.is(setLogLevelStub.getCall(0).args[0], "silly", "sets log level to verbose");
-	t.is(setLogLevelStub.getCall(1).args[0], "verbose", "sets log level to verbose");
+	t.is(setLogLevelStub.getCall(0).args[0], "verbose", "sets log level to verbose");
+	t.is(setLogLevelStub.getCall(1).args[0], "silly", "sets log level to verbose");
 });
 
 test.serial("With log-level, verbose, perf and silent flag", async (t) => {
 	const {logger, setLogLevelStub} = t.context;
 	await logger.initLogger({loglevel: "silly", verbose: true, perf: true, silent: true});
 	t.is(setLogLevelStub.callCount, 4, "setLevel has been called four times");
-	t.is(setLogLevelStub.getCall(0).args[0], "silly", "sets log level to verbose");
+	t.is(setLogLevelStub.getCall(0).args[0], "silent", "sets log level to silent");
 	t.is(setLogLevelStub.getCall(1).args[0], "perf", "sets log level to perf");
 	t.is(setLogLevelStub.getCall(2).args[0], "verbose", "Third sets log level to verbose");
-	t.is(setLogLevelStub.getCall(3).args[0], "silent", "sets log level to silent");
+	t.is(setLogLevelStub.getCall(3).args[0], "silly", "sets log level to verbose");
 });
 
 import path from "node:path";