You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/08/10 07:15:56 UTC
[15/26] directory-kerby git commit: Add the time in log.
Add the time in log.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/403e2467
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/403e2467
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/403e2467
Branch: refs/heads/pkinit-support
Commit: 403e2467beb084ea97898e3b5002c12d0a6909e4
Parents: c04d154
Author: plusplusjiajia <ji...@intel.com>
Authored: Thu Aug 6 17:00:18 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Thu Aug 6 17:00:18 2015 +0800
----------------------------------------------------------------------
.../kdc/identitybackend/ZookeeperIdentityBackend.java | 6 +-----
kerby-dist/README.md | 14 +++++++-------
kerby-dist/kdc-dist/log4j.properties | 2 +-
kerby-dist/tool-dist/log4j.properties | 2 +-
4 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/403e2467/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java
index 88156d9..4e331da 100644
--- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java
+++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java
@@ -164,11 +164,7 @@ public class ZookeeperIdentityBackend extends AbstractIdentityBackend {
try {
zooKeeperServer.runFromConfig(configuration);
} catch (IOException e) {
- try {
- throw new KrbException("ZooKeeper Failed", e);
- } catch (KrbException e1) {
- e1.printStackTrace();
- }
+ LOG.warn(e.getMessage());
}
}
};
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/403e2467/kerby-dist/README.md
----------------------------------------------------------------------
diff --git a/kerby-dist/README.md b/kerby-dist/README.md
index 0616eb8..4b3daff 100644
--- a/kerby-dist/README.md
+++ b/kerby-dist/README.md
@@ -36,19 +36,19 @@ sh bin/kdcinit.sh [server-conf-dir] [keytab]
```
The admin principal will be exported into [keytab], it will be used by kadmin tool for the authentication.
-* 3. Run kadmin to add principals:
+* 3. Start kerby-kdc-server:
```
cd kerby-dist/kdc-dist
-sh bin/kadmin.sh [server-conf-dir] -k [keytab]
+sh bin/start-kdc.sh –start [server-conf-dir] [work-dir]
```
- In kadmin, you can type "?" for help.
-
-* 4. Start kerby-kdc-server:
+* 4. Run kadmin to add principals:
```
cd kerby-dist/kdc-dist
-sh bin/start-kdc.sh –start [server-conf-dir] [work-dir]
+sh bin/kadmin.sh [server-conf-dir] -k [keytab]
```
+ The keytab file is created by the kdcinit.
+ In kadmin, you can type "?" for help.
* 5. Run kinit:
```
@@ -63,7 +63,7 @@ sh bin/klist.sh -c [credentials-cache]
```
If you don't specify [server-conf-dir] in step 2, 3 or 4, it will be set as /etc/kerby. In [server-conf-dir], there should be kdc.conf, backend.conf.
- And if you don't specify [client -conf-dir] in step 5, it will be set as /etc/, there should be krb5.conf.
+ And if you don't specify [client-conf-dir] in step 5, it will be set as /etc/, there should be krb5.conf.
An example of kdc.conf:
```
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/403e2467/kerby-dist/kdc-dist/log4j.properties
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/log4j.properties b/kerby-dist/kdc-dist/log4j.properties
index 9c6914d..dc84c55 100644
--- a/kerby-dist/kdc-dist/log4j.properties
+++ b/kerby-dist/kdc-dist/log4j.properties
@@ -7,5 +7,5 @@ log4j.appender.STDOUT.layout.ConversionPattern=Logger-->%5p{%F:%L}-%m%n
log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
log4j.appender.R.File=logs/${KERBY_LOGFILE}.log
log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=Logger-->%5p{%F:%L}-%m%n
+log4j.appender.R.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p{%F:%L}-%m%n
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/403e2467/kerby-dist/tool-dist/log4j.properties
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/log4j.properties b/kerby-dist/tool-dist/log4j.properties
index 9c6914d..dc84c55 100644
--- a/kerby-dist/tool-dist/log4j.properties
+++ b/kerby-dist/tool-dist/log4j.properties
@@ -7,5 +7,5 @@ log4j.appender.STDOUT.layout.ConversionPattern=Logger-->%5p{%F:%L}-%m%n
log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
log4j.appender.R.File=logs/${KERBY_LOGFILE}.log
log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=Logger-->%5p{%F:%L}-%m%n
+log4j.appender.R.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p{%F:%L}-%m%n