Commit 1ff791cf by Sarath Subramanian

ATLAS-2331: Provide option to start embedded Solr server for Integration Tests #2

parent 716afc53
...@@ -30,6 +30,7 @@ import java.io.InputStreamReader; ...@@ -30,6 +30,7 @@ import java.io.InputStreamReader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -132,24 +133,24 @@ public class LocalSolrRunner { ...@@ -132,24 +133,24 @@ public class LocalSolrRunner {
public static void main(String[] args) { public static void main(String[] args) {
if (ArrayUtils.isEmpty(args)) { if (ArrayUtils.isEmpty(args)) {
System.out.println("No arguments!"); System.out.println("No argument!");
} else if (args[0].equals("start")) { } else if (args[0].equals("start")) {
try { try {
start(); start();
System.out.println("Started Local Solr Server: "+ getZookeeperUrls()); System.out.println("Started Local Solr Server: "+ getZookeeperUrls());
} catch (Exception e) { } catch (Exception e) {
//do nothing System.out.println("Error starting Local Solr Server: " + e);
} }
} else if (args[0].equals("stop")) { } else if (args[0].equals("stop")) {
try { try {
System.out.println("Stopping Local Solr Server.");
stop(); stop();
System.out.println("Shutting Local Solr Server.");
} catch (Exception e) { } catch (Exception e) {
//do nothing System.out.println("Error stopping Local Solr Server: " + e);
} }
} else { } else {
System.out.println("Bad arguments!"); System.out.println("Bad first argument: " + Arrays.toString(args));
} }
} }
} }
\ No newline at end of file
...@@ -14,21 +14,19 @@ ...@@ -14,21 +14,19 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# A1 is set to be a FileAppender. # file is set to be a FileAppender.
log4j.appender.A1=org.apache.log4j.FileAppender log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.A1.File=target/test.log log4j.appender.file.File=target/test.log
log4j.appender.A1.Threshold=ALL log4j.appender.file.Threshold=ALL
# A1 uses PatternLayout. log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5p %c{2}: %m%n
log4j.appender.A1.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5p %c{2}: %m%n
# A2 is a ConsoleAppender. # console is a ConsoleAppender.
log4j.appender.A2=org.apache.log4j.ConsoleAppender log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.A2.Threshold=ALL log4j.appender.console.Threshold=ALL
# A2 uses PatternLayout. log4j.appender.console.layout=org.apache.log4j.PatternLayout
log4j.appender.A2.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5p %c{2}: %m%n
log4j.appender.A2.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5p %c{2}: %m%n
# Set both appenders (A1 and A2) on the root logger. # Set both appenders (file and console) on the root logger.
#log4j.rootLogger=INFO, A1, A2 #log4j.rootLogger=INFO, file, console
log4j.rootLogger=ERROR, A1 log4j.rootLogger=ERROR, file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment