Author: asavu
Date: Mon Oct 31 22:51:31 2011
New Revision: 1195712
URL: http://svn.apache.org/viewvc?rev=1195712&view=rev
Log:
WHIRR-418. Add ssh debug logs to tests (Adrian Cole via asavu)
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/core/src/test/resources/log4j.xml
whirr/trunk/services/cassandra/src/test/resources/log4j.xml
whirr/trunk/services/cdh/src/test/resources/log4j.xml
whirr/trunk/services/chef/src/test/resources/log4j.xml
whirr/trunk/services/ganglia/src/test/resources/log4j.xml
whirr/trunk/services/hadoop/src/test/resources/log4j.xml
whirr/trunk/services/hbase/src/test/resources/log4j.xml
whirr/trunk/services/puppet/src/test/resources/log4j.xml
whirr/trunk/services/voldemort/src/test/resources/log4j.xml
whirr/trunk/services/zookeeper/src/test/resources/log4j.xml
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Mon Oct 31 22:51:31 2011
@@ -52,6 +52,8 @@ Trunk (unreleased changes)
WHIRR-411. put install_git, install_ruby scripts in core (Alex Heneveld
via asavu)
+ WHIRR-418. Add ssh debug logs to tests (Adrian Cole via asavu)
+
BUG FIXES
WHIRR-377. Fix broken CLI logging config. (asavu via tomwhite)
Modified: whirr/trunk/core/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/core/src/test/resources/log4j.xml (original)
+++ whirr/trunk/core/src/test/resources/log4j.xml Mon Oct 31 22:51:31 2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/cassandra/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/cassandra/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/cassandra/src/test/resources/log4j.xml Mon Oct 31
22:51:31 2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/cdh/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/cdh/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/cdh/src/test/resources/log4j.xml Mon Oct 31 22:51:31
2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/chef/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/chef/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/chef/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/chef/src/test/resources/log4j.xml Mon Oct 31 22:51:31
2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/ganglia/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/ganglia/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/ganglia/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/ganglia/src/test/resources/log4j.xml Mon Oct 31
22:51:31 2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/hadoop/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/hadoop/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/hadoop/src/test/resources/log4j.xml Mon Oct 31
22:51:31 2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/hbase/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/hbase/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/hbase/src/test/resources/log4j.xml Mon Oct 31 22:51:31
2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/puppet/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/puppet/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/puppet/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/puppet/src/test/resources/log4j.xml Mon Oct 31
22:51:31 2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/voldemort/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/voldemort/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/voldemort/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/voldemort/src/test/resources/log4j.xml Mon Oct 31
22:51:31 2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: whirr/trunk/services/zookeeper/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/src/test/resources/log4j.xml?rev=1195712&r1=1195711&r2=1195712&view=diff
==============================================================================
--- whirr/trunk/services/zookeeper/src/test/resources/log4j.xml (original)
+++ whirr/trunk/services/zookeeper/src/test/resources/log4j.xml Mon Oct 31
22:51:31 2011
@@ -132,6 +132,17 @@
</layout>
</appender>
+ <!-- A time/date based rolling appender -->
+ <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="target/test-data/jclouds-ssh.log" />
+ <param name="Append" value="true" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="Threshold" value="TRACE" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+ </layout>
+ </appender>
+
<appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="COMPUTEFILE" />
</appender>
@@ -146,6 +157,10 @@
<appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="BLOBSTOREFILE" />
</appender>
+
+ <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="SSHFILE" />
+ </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -173,6 +188,11 @@
<appender-ref ref="ASYNCCOMPUTE" />
</category>
+ <category name="jclouds.ssh">
+ <priority value="TRACE" />
+ <appender-ref ref="ASYNCSSH" />
+ </category>
+
<category name="jclouds.wire">
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
@@ -193,4 +213,4 @@
<appender-ref ref="CONSOLE" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
