Skip to content

Commit

Permalink
Merge branch 'master' into feature/maven_concurrent_build
Browse files Browse the repository at this point in the history
  • Loading branch information
rberezen committed Aug 17, 2023
2 parents da2c128 + 0101b8c commit 265553b
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,9 @@ public void validate() throws CommandValidationException {
* Executes the command in this scope, and returns the results.
*/
public CommandResults execute() throws CommandExecutionException {
Scope.getCurrentScope().addMdcValue(MdcKey.OPERATION_START_TIME, new ISODateFormat().format(new Date()));
// We don't want to reset the command name even when defining another CommandScope during execution because we intend on keeping this value as the command entered to the console
Scope.getCurrentScope().addMdcValue(MdcKey.OPERATION_START_TIME, Instant.ofEpochMilli(new Date().getTime()).toString());
// We don't want to reset the command name even when defining another CommandScope during execution
// because we intend on keeping this value as the command entered to the console
if (!Scope.getCurrentScope().isMdcKeyPresent(MdcKey.LIQUIBASE_COMMAND_NAME)) {
Scope.getCurrentScope().addMdcValue(MdcKey.LIQUIBASE_COMMAND_NAME, String.join(" ", commandDefinition.getName()));
}
Expand Down

0 comments on commit 265553b

Please sign in to comment.