honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use nonzero status code to signal abnormal termination 

We currently return with status code 0 when an IOException occurs.
The plugin manager should in any case return a nonzero status if
the operation was not successful. Now the PluginManager uses the
following reponse codes based on 'sysexists.sh':
 * '0' on success
 * '64' command line usage error
 * '70' internal software error
 * '74' input/output

Closes #3463
This commit is contained in:
Simon Willnauer 2013-08-08 14:29:09 +02:00
parent f8f8cac0ed
commit 2ed87b5312
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/org/elasticsearch/plugins/PluginManager.java
View File

@ -28,10 +28,6 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.node.internal.InternalSettingsPerparer; import org.elasticsearch.node.internal.InternalSettingsPerparer;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
@ -40,6 +36,11 @@ import java.util.Enumeration;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import static org.elasticsearch.common.settings.ImmutableSettings.Builder.EMPTY_SETTINGS; import static org.elasticsearch.common.settings.ImmutableSettings.Builder.EMPTY_SETTINGS;
/** /**
@ -307,6 +308,11 @@ public class PluginManager {
} }
} }
private static final int EXIT_CODE_OK = 0;
private static final int EXIT_CODE_CMD_USAGE = 64;
private static final int EXIT_CODE_IO_ERROR = 74;
private static final int EXIT_CODE_ERROR = 70;
public static void main(String[] args) { public static void main(String[] args) {
Tuple<Settings, Environment> initialSettings = InternalSettingsPerparer.prepareSettings(EMPTY_SETTINGS, true); Tuple<Settings, Environment> initialSettings = InternalSettingsPerparer.prepareSettings(EMPTY_SETTINGS, true);
@ -351,46 +357,63 @@ public class PluginManager {
} else { } else {
displayHelp("Command [" + args[c] + "] unknown."); displayHelp("Command [" + args[c] + "] unknown.");
// Unknown command. We break... // Unknown command. We break...
System.exit(1); System.exit(EXIT_CODE_CMD_USAGE);
} }
} }
} catch (Exception e) { } catch (Throwable e) {
displayHelp("Error while parsing options: " + e.getClass().getSimpleName() + displayHelp("Error while parsing options: " + e.getClass().getSimpleName() +
": " + e.getMessage()); ": " + e.getMessage());
System.exit(1); System.exit(EXIT_CODE_CMD_USAGE);
} }
if (action > ACTION.NONE) { if (action > ACTION.NONE) {
int exitCode = EXIT_CODE_ERROR; // we fail unless it's reset
PluginManager pluginManager = new PluginManager(initialSettings.v2(), url); PluginManager pluginManager = new PluginManager(initialSettings.v2(), url);
switch (action) { switch (action) {
case ACTION.INSTALL: case ACTION.INSTALL:
try { try {
System.out.println("-> Installing " + pluginName + "..."); System.out.println("-> Installing " + pluginName + "...");
pluginManager.downloadAndExtract(pluginName, verbose); pluginManager.downloadAndExtract(pluginName, verbose);
exitCode = EXIT_CODE_OK;
} catch (IOException e) { } catch (IOException e) {
exitCode = EXIT_CODE_IO_ERROR;
System.out.println("Failed to install " + pluginName + ", reason: " + e.getMessage()); System.out.println("Failed to install " + pluginName + ", reason: " + e.getMessage());
} catch (Exception e) { } catch (Throwable e) {
exitCode = EXIT_CODE_ERROR;
displayHelp("Error while installing plugin, reason: " + e.getClass().getSimpleName() + displayHelp("Error while installing plugin, reason: " + e.getClass().getSimpleName() +
": " + e.getMessage()); ": " + e.getMessage());
System.exit(1);
} }
break; break;
case ACTION.REMOVE: case ACTION.REMOVE:
try { try {
System.out.println("-> Removing " + pluginName + " "); System.out.println("-> Removing " + pluginName + " ");
pluginManager.removePlugin(pluginName); pluginManager.removePlugin(pluginName);
exitCode = EXIT_CODE_OK;
} catch (IOException e) { } catch (IOException e) {
exitCode = EXIT_CODE_IO_ERROR;
System.out.println("Failed to remove " + pluginName + ", reason: " + e.getMessage()); System.out.println("Failed to remove " + pluginName + ", reason: " + e.getMessage());
} catch (Exception e) { } catch (Throwable e) {
exitCode = EXIT_CODE_ERROR;
displayHelp("Error while removing plugin, reason: " + e.getClass().getSimpleName() + displayHelp("Error while removing plugin, reason: " + e.getClass().getSimpleName() +
": " + e.getMessage()); ": " + e.getMessage());
} }
break; break;
case ACTION.LIST: case ACTION.LIST:
try {
pluginManager.listInstalledPlugins(); pluginManager.listInstalledPlugins();
break; exitCode = EXIT_CODE_OK;
} catch (Throwable e) {
displayHelp("Error while listing plugins, reason: " + e.getClass().getSimpleName() +
": " + e.getMessage());
} }
break;
default:
System.out.println("Unknown Action [" + action + "]");
exitCode = EXIT_CODE_ERROR;
}
System.exit(exitCode); // exit here!
} }
} }