Skip to content
This repository was archived by the owner on Dec 9, 2024. It is now read-only.

fix: Fix log level setting to handle --verbose #475

Merged
merged 1 commit into from
Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/services/loggingService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ describe("Logging Service", () => {
expect(sls.cli.log).lastCalledWith("[ERROR] Error");
});

it("empty string as option value sets logging level to debug", () => {
it("boolean as option value sets logging level to debug", () => {
const sls = MockFactory.createTestServerless();
loggingService = createService(sls, {"verbose": ""});
loggingService = createService(sls, {"verbose": true});
loggingService.debug("Debug");
expect(sls.cli.log).toBeCalledWith("[DEBUG] Debug");
});
Expand Down
29 changes: 18 additions & 11 deletions src/services/loggingService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,25 @@ export class LoggingService {
private logLevel: LogLevel;

public constructor(private serverless: Serverless, private options: ServerlessAzureOptions) {

// Check for 'verbose' or 'v'. Would use the sls shortcuts at the plugin level,
// but this will be utilized across the plugins, so we check for both
const logLevelStr = Utils.get(options, "verbose");
const verbosity = Utils.get(options, "verbose");
const defaultLogLevel = LogLevel.INFO;

this.logLevel = (logLevelStr !== undefined) ? Utils.get({
"error": LogLevel.ERROR,
"warn": LogLevel.WARN,
"info": LogLevel.INFO,
"debug": LogLevel.DEBUG,
"": LogLevel.DEBUG
}, logLevelStr.toLowerCase()) : LogLevel.INFO;
if (verbosity === true) {
// --verbose flag is passed with no specified level
this.logLevel = LogLevel.DEBUG;
} else if (typeof verbosity === "string") {
// --verbose {level} is passed
this.logLevel = Utils.get({
"error": LogLevel.ERROR,
"warn": LogLevel.WARN,
"info": LogLevel.INFO,
"debug": LogLevel.DEBUG,
"": LogLevel.DEBUG
}, verbosity.toLowerCase(), defaultLogLevel);
} else {
// --verbose not passed, use default
this.logLevel = defaultLogLevel;
}
}

/**
Expand Down