honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow System#exit() from command line tools

Browse Source 
This commit adds SuppressForbidden annotations to command line tools to
still allow to call System#exit() (see also issue 12596 in ES core).

Original commit: elastic/x-pack-elasticsearch@1dd3f1dcb1
This commit is contained in:
Daniel Mitterdorfer 2015-11-04 13:37:44 +01:00
parent 1d6845190f
commit 081ffbeced
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shield/src/main/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersTool.java
View File

@ -7,6 +7,7 @@ package org.elasticsearch.shield.authc.esusers.tool;
import org.apache.commons.cli.CommandLine;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.cli.CheckFileCommand;
import org.elasticsearch.common.cli.CliTool;
import org.elasticsearch.common.cli.CliToolConfig;
@ -51,7 +52,12 @@ public class ESUsersTool extends CliTool {
public static void main(String[] args) {
ExitStatus exitStatus = new ESUsersTool().execute(args);
System.exit(exitStatus.status());
exit(exitStatus.status());
}
@SuppressForbidden(reason = "Allowed to exit explicitly from #main()")
private static void exit(int status) {
System.exit(status);
}
public ESUsersTool() {

8
shield/src/main/java/org/elasticsearch/shield/crypto/tool/SystemKeyTool.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.shield.crypto.tool;
import org.apache.commons.cli.CommandLine;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.cli.CheckFileCommand;
import org.elasticsearch.common.cli.CliTool;
import org.elasticsearch.common.cli.CliToolConfig;
@ -37,7 +38,12 @@ public class SystemKeyTool extends CliTool {
public static void main(String[] args) throws Exception {
ExitStatus exitStatus = new SystemKeyTool().execute(args);
System.exit(exitStatus.status());
exit(exitStatus.status());
}
@SuppressForbidden(reason = "Allowed to exit explicitly from #main()")
private static void exit(int status) {
System.exit(status);
}
private static final CliToolConfig CONFIG = config("syskey", SystemKeyTool.class)

8
watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalTool.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.watcher.trigger.schedule.tool;
import org.apache.commons.cli.CommandLine;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.cli.CliTool;
import org.elasticsearch.common.cli.CliToolConfig;
import org.elasticsearch.common.cli.Terminal;
@ -32,7 +33,12 @@ public class CronEvalTool extends CliTool {
public static void main(String[] args) throws Exception {
ExitStatus exitStatus = new CronEvalTool().execute(args);
System.exit(exitStatus.status());
exit(exitStatus.status());
}
@SuppressForbidden(reason = "Allowed to exit explicitly from #main()")
private static void exit(int status) {
System.exit(status);
}
public CronEvalTool() {