You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sa...@apache.org on 2018/01/04 18:44:06 UTC
atlas git commit: ATLAS-2331: Provide option to start embedded Solr
server for Integration Tests #2
Repository: atlas
Updated Branches:
refs/heads/master 716afc53b -> 1ff791cfc
ATLAS-2331: Provide option to start embedded Solr server for Integration Tests #2
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/1ff791cf
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/1ff791cf
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/1ff791cf
Branch: refs/heads/master
Commit: 1ff791cfca9c8167db92bbde0ce02969620cdd60
Parents: 716afc5
Author: Sarath Subramanian <ss...@hortonworks.com>
Authored: Thu Jan 4 10:41:57 2018 -0800
Committer: Sarath Subramanian <ss...@hortonworks.com>
Committed: Thu Jan 4 10:41:57 2018 -0800
----------------------------------------------------------------------
.../apache/atlas/runner/LocalSolrRunner.java | 11 +++----
test-tools/src/main/resources/log4j.properties | 30 +++++++++-----------
2 files changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/1ff791cf/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java
----------------------------------------------------------------------
diff --git a/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java b/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java
index 937c1d0..cdcac64 100644
--- a/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java
+++ b/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java
@@ -30,6 +30,7 @@ import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.Arrays;
import java.util.UUID;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -132,24 +133,24 @@ public class LocalSolrRunner {
public static void main(String[] args) {
if (ArrayUtils.isEmpty(args)) {
- System.out.println("No arguments!");
+ System.out.println("No argument!");
} else if (args[0].equals("start")) {
try {
start();
System.out.println("Started Local Solr Server: "+ getZookeeperUrls());
} catch (Exception e) {
- //do nothing
+ System.out.println("Error starting Local Solr Server: " + e);
}
} else if (args[0].equals("stop")) {
try {
+ System.out.println("Stopping Local Solr Server.");
stop();
- System.out.println("Shutting Local Solr Server.");
} catch (Exception e) {
- //do nothing
+ System.out.println("Error stopping Local Solr Server: " + e);
}
} else {
- System.out.println("Bad arguments!");
+ System.out.println("Bad first argument: " + Arrays.toString(args));
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/1ff791cf/test-tools/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/test-tools/src/main/resources/log4j.properties b/test-tools/src/main/resources/log4j.properties
index d62cf80..4db0598 100644
--- a/test-tools/src/main/resources/log4j.properties
+++ b/test-tools/src/main/resources/log4j.properties
@@ -14,21 +14,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# A1 is set to be a FileAppender.
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=target/test.log
-log4j.appender.A1.Threshold=ALL
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5p %c{2}: %m%n
+# file is set to be a FileAppender.
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=target/test.log
+log4j.appender.file.Threshold=ALL
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5p %c{2}: %m%n
-# A2 is a ConsoleAppender.
-log4j.appender.A2=org.apache.log4j.ConsoleAppender
-log4j.appender.A2.Threshold=ALL
-# A2 uses PatternLayout.
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5p %c{2}: %m%n
+# console is a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Threshold=ALL
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.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.
-#log4j.rootLogger=INFO, A1, A2
-log4j.rootLogger=ERROR, A1
+# Set both appenders (file and console) on the root logger.
+#log4j.rootLogger=INFO, file, console
+log4j.rootLogger=ERROR, file