Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 1 addition & 0 deletions libs/cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ apply plugin: 'elasticsearch.publish'
dependencies {
api 'net.sf.jopt-simple:jopt-simple:5.0.2'
api project(':libs:core')
api project(':libs:logging')

testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'cli'
Expand Down
2 changes: 2 additions & 0 deletions libs/cli/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
module org.elasticsearch.cli {
requires jopt.simple;
requires org.elasticsearch.base;
requires java.logging;
requires org.elasticsearch.logging;

exports org.elasticsearch.cli;
}
6 changes: 6 additions & 0 deletions libs/cli/src/main/java/org/elasticsearch/cli/Command.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import joptsimple.OptionSpec;

import org.elasticsearch.core.SuppressForbidden;
import org.elasticsearch.logging.Level;
import org.elasticsearch.logging.internal.spi.LoggerFactory;

import java.io.Closeable;
import java.io.IOException;
Expand Down Expand Up @@ -84,12 +86,16 @@ protected void mainWithoutErrorHandling(String[] args, Terminal terminal, Proces
return;
}

LoggerFactory loggerFactory = LoggerFactory.provider();
if (options.has(silentOption)) {
terminal.setVerbosity(Terminal.Verbosity.SILENT);
loggerFactory.setRootLevel(Level.OFF);
} else if (options.has(verboseOption)) {
terminal.setVerbosity(Terminal.Verbosity.VERBOSE);
loggerFactory.setRootLevel(Level.DEBUG);
} else {
terminal.setVerbosity(Terminal.Verbosity.NORMAL);
loggerFactory.setRootLevel(Level.INFO);
}

execute(terminal, options, processInfo);
Expand Down
2 changes: 1 addition & 1 deletion libs/logging/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

module org.elasticsearch.logging {
exports org.elasticsearch.logging;
exports org.elasticsearch.logging.internal.spi to org.elasticsearch.server;
exports org.elasticsearch.logging.internal.spi to org.elasticsearch.server, org.elasticsearch.cli;
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.logging.internal.spi;

import org.elasticsearch.logging.Level;
import org.elasticsearch.logging.Logger;

/**
Expand All @@ -26,6 +27,8 @@ public static LoggerFactory provider() {

public abstract Logger getLogger(Class<?> clazz);

public abstract void setRootLevel(Level level);

public static void setInstance(LoggerFactory INSTANCE) {
LoggerFactory.INSTANCE = INSTANCE;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
package org.elasticsearch.common.logging.internal;

import org.apache.logging.log4j.LogManager;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.logging.Level;
import org.elasticsearch.logging.Logger;
import org.elasticsearch.logging.internal.spi.LoggerFactory;

Expand All @@ -30,4 +32,10 @@ public Logger getLogger(Class<?> clazz) {
// classloader a class comes from, we will use the root logging config.
return getLogger(clazz.getName());
}

@Override
public void setRootLevel(Level level) {
var log4jLevel = LevelUtil.log4jLevel(level);
Loggers.setLevel(LogManager.getRootLogger(), log4jLevel);
}
}
1 change: 1 addition & 0 deletions x-pack/plugin/security/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
requires oauth2.oidc.sdk;
requires org.slf4j;
requires unboundid.ldapsdk;
requires org.elasticsearch.logging;

exports org.elasticsearch.xpack.security.action to org.elasticsearch.server;
exports org.elasticsearch.xpack.security.action.apikey to org.elasticsearch.server;
Expand Down