You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/02/11 20:06:56 UTC
[tika] 02/02: add back ? and -help/clean up printlns
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 625dc63a71a4cdd2bbe725eefa9bd6e9b2be5f87
Author: tballison <ta...@apache.org>
AuthorDate: Thu Feb 11 15:06:42 2021 -0500
add back ? and -help/clean up printlns
---
.../org/apache/tika/server/core/TikaServerCli.java | 7 +++---
.../apache/tika/server/core/TikaServerProcess.java | 29 +++++++++-------------
.../core/TikaServerAsyncIntegrationTest.java | 4 ---
.../server/core/TikaServerIntegrationTest.java | 4 ---
4 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
index 94488f1..d1dcc48 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
@@ -81,6 +81,9 @@ public class TikaServerCli {
CommandLineParser cliParser = new DefaultParser();
CommandLine line = cliParser.parse(options, args);
+ if (line.hasOption("help")) {
+ usage(options);
+ }
TikaServerConfig tikaServerConfig = TikaServerConfig.load(line);
if (tikaServerConfig.isNoFork()) {
noFork(tikaServerConfig);
@@ -113,23 +116,19 @@ public class TikaServerCli {
while (finished < portIdPairs.size()) {
Future<WatchDogResult> future = executorCompletionService.poll(1, TimeUnit.MINUTES);
if (future != null) {
- System.err.println("main loop future");
LOG.debug("main loop future is available");
WatchDogResult result = future.get();
- System.err.println("main loop future get");
LOG.debug("main loop future: ({}); finished", result);
finished++;
}
}
} catch (InterruptedException e) {
- System.err.println("INTERRUPTED");
for (TikaServerWatchDog w : watchers) {
w.shutDown();
}
LOG.debug("thread interrupted", e);
} finally {
//this is just asking nicely...there is no guarantee!
- System.err.println("shutting down");
executorService.shutdownNow();
}
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
index f1d9813..a9afecd 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
@@ -153,7 +153,6 @@ public class TikaServerProcess {
executorCompletionService.submit(new AsyncParser(asyncFetchEmitQueue, asyncEmitData));
}
}
- System.out.println("starting server again? " + tikaServerConfig);
//start the server
Server server = serverDetails.sf.create();
LOG.info("Started Apache Tika server {} at {}",
@@ -367,7 +366,6 @@ public class TikaServerProcess {
}
resourceProviders.addAll(loadResourceServices());
}
- System.out.println("loaded "+resourceProviders);
return resourceProviders;
}
@@ -396,24 +394,29 @@ public class TikaServerProcess {
LOG.info(sb.toString());
} else {
if (tika.getEmitterManager().getSupported().size() > 0) {
- String warn = "-enableUnsecureFeatures has not been specified on the commandline.\n" +
+ String warn = "enableUnsecureFeatures has not been set to 'true' in the server config file.\n" +
"The " + tika.getEmitterManager().getSupported().size() + " emitter(s) that you've\n" +
- "specified in TikaConfig will not be available on the /emit endpoint\n" +
- "To enable your emitters, start tika-server with the -enableUnsecureFeatures flag\n\n";
+ "specified in TikaConfig will not be available on the /emit or /async endpoints.\n" +
+ "To enable your emitters, start tika-server with " +
+ "<enableUnsecureFeatures>true</enableUnsecureFeatures> parameter in " +
+ "the TikaConfig\n\n";
LOG.warn(warn);
}
if (tika.getFetcherManager().getSupported().size() > 0) {
- String warn = "-enableUnsecureFeatures has not been specified on the commandline.\n" +
+ String warn = "enableUnsecureFeatures has not been set to 'true' in the server config file.\n" +
"The " + tika.getFetcherManager().getSupported().size() + " fetcher(s) that you've\n" +
- "specified in TikaConfig will not be available\n" +
- "To enable your fetchers, start tika-server with the -enableUnsecureFeatures flag\n\n";
+ "specified in TikaConfig will not be available on the /emit or /async endpoints.\n" +
+ "To enable your emitters, start tika-server with " +
+ "<enableUnsecureFeatures>true</enableUnsecureFeatures> parameter in " +
+ "the TikaConfig\n\n";
LOG.warn(warn);
}
}
}
private static Collection<? extends ResourceProvider> loadResourceServices() {
- List<TikaServerResource> resources = new ServiceLoader(TikaServerProcess.class.getClassLoader())
+ List<TikaServerResource> resources = new ServiceLoader(
+ TikaServerProcess.class.getClassLoader())
.loadServiceProviders(TikaServerResource.class);
List<ResourceProvider> providers = new ArrayList<>();
@@ -428,14 +431,6 @@ public class TikaServerProcess {
.loadServiceProviders(org.apache.tika.server.core.writer.TikaServerWriter.class);
}
- private static void usage(Options options) {
- HelpFormatter helpFormatter = new HelpFormatter();
- helpFormatter.printHelp("tikaserver", options);
- System.exit(-1);
- }
-
-
-
private static class ServerDetails {
JAXRSServerFactoryBean sf;
String serverId;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
index d99490c..580cf81 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
@@ -156,16 +156,13 @@ public class TikaServerAsyncIntegrationTest extends IntegrationTestBase {
try {
JsonNode response = sendAsync(FILE_LIST);
- System.out.println(response);
int expected = (ON_PARSE_EXCEPTION == FetchEmitTuple.ON_PARSE_EXCEPTION.EMIT) ?
FILE_LIST.size() : FILE_LIST.size()/2;
int targets = 0;
while (targets < FILE_LIST.size()) {
- System.out.println("targets "+targets);
targets = countTargets();
Thread.sleep(1000);
}
- System.out.println("TARGETS: "+targets);
} finally {
serverThread.interrupt();
}
@@ -187,7 +184,6 @@ public class TikaServerAsyncIntegrationTest extends IntegrationTestBase {
.create(endPoint + "/async")
.accept("application/json")
.post(json);
- System.out.println("status: " + response.getStatus());
Reader reader = new InputStreamReader((InputStream) response.getEntity(), UTF_8);
return new ObjectMapper().readTree(reader);
}
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
index a191cb0..11b6f2a 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
@@ -420,7 +420,6 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
awaitServerStartup();
Random r = new Random();
for (int i = 0; i < 100; i++) {
- System.out.println("FILE # " + i);
boolean ex = false;
Response response = null;
String file = TEST_HELLO_WORLD;
@@ -432,7 +431,6 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
} else if (r.nextFloat() < 0.02) {
file = TEST_HEAVY_HANG;
}
- System.out.println("about to process: " + file);
response = WebClient
.create(endPoint + META_PATH)
.accept("application/json")
@@ -443,10 +441,8 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
}
if (ex || response.getStatus() != 200) {
- System.out.println("restarting");
i--;
awaitServerStartup();
- System.out.println("done awaiting");
continue;
}
if (file.equals(TEST_HELLO_WORLD)) {