You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2012/05/21 17:29:05 UTC
svn commit: r1341070 - in
/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd:
common/keyprovider/AbstractKeyPairProvider.java
common/keyprovider/FileKeyPairProvider.java
server/keyprovider/AbstractGeneratorHostKeyProvider.java
Author: gnodet
Date: Mon May 21 15:29:05 2012
New Revision: 1341070
URL: http://svn.apache.org/viewvc?rev=1341070&view=rev
Log:
[SSHD-103] Fix logging of key generators
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractKeyPairProvider.java
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractKeyPairProvider.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractKeyPairProvider.java?rev=1341070&r1=1341069&r2=1341070&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractKeyPairProvider.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractKeyPairProvider.java Mon May 21 15:29:05 2012
@@ -25,6 +25,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.sshd.common.KeyPairProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* TODO Add javadoc
@@ -33,6 +35,8 @@ import org.apache.sshd.common.KeyPairPro
*/
public abstract class AbstractKeyPairProvider implements KeyPairProvider {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
public KeyPair loadKey(String type) {
assert type != null;
KeyPair[] keys = loadKeys();
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java?rev=1341070&r1=1341069&r2=1341070&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java Mon May 21 15:29:05 2012
@@ -27,8 +27,6 @@ import java.util.List;
import org.apache.sshd.common.util.SecurityUtils;
import org.bouncycastle.openssl.PEMReader;
import org.bouncycastle.openssl.PasswordFinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* This host key provider loads private keys from the specified files.
@@ -40,8 +38,6 @@ import org.slf4j.LoggerFactory;
*/
public class FileKeyPairProvider extends AbstractKeyPairProvider {
- private static final Logger LOG = LoggerFactory.getLogger(FileKeyPairProvider.class);
-
private String[] files;
private PasswordFinder passwordFinder;
@@ -90,7 +86,7 @@ public class FileKeyPairProvider extends
r.close();
}
} catch (Exception e) {
- LOG.info("Unable to read key {}: {}", files[i], e);
+ log.info("Unable to read key {}: {}", files[i], e);
}
}
return keys.toArray(new KeyPair[keys.size()]);
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java?rev=1341070&r1=1341069&r2=1341070&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java Mon May 21 15:29:05 2012
@@ -29,10 +29,7 @@ import java.security.KeyPair;
import java.security.KeyPairGenerator;
import org.apache.sshd.common.keyprovider.AbstractKeyPairProvider;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.common.util.SecurityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* TODO Add javadoc
@@ -41,8 +38,6 @@ import org.slf4j.LoggerFactory;
*/
public abstract class AbstractGeneratorHostKeyProvider extends AbstractKeyPairProvider {
- private static final Logger LOG = LoggerFactory.getLogger(FileKeyPairProvider.class);
-
private String path;
private String algorithm = "DSA";
private int keySize;
@@ -121,7 +116,7 @@ public abstract class AbstractGeneratorH
is = new FileInputStream(f);
return doReadKeyPair(is);
} catch (Exception e) {
- LOG.info("Unable to read key {}: {}", path, e);
+ log.info("Unable to read key {}: {}", path, e);
} finally {
close(is);
}
@@ -134,7 +129,7 @@ public abstract class AbstractGeneratorH
os = new FileOutputStream(f);
doWriteKeyPair(kp, os);
} catch (Exception e) {
- LOG.info("Unable to write key {}: {}", path, e);
+ log.info("Unable to write key {}: {}", path, e);
} finally {
close(os);
}
@@ -146,11 +141,11 @@ public abstract class AbstractGeneratorH
if (keySize != 0) {
generator.initialize(keySize);
}
- LOG.info("Generating host key...");
+ log.info("Generating host key...");
KeyPair kp = generator.generateKeyPair();
return kp;
} catch (Exception e) {
- LOG.error("Unable to generate keypair", e);
+ log.error("Unable to generate keypair", e);
return null;
}
}