You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/07/22 21:39:56 UTC
git commit: [KARAF-3134] Log executed shell commands at info level
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 7c290b6ab -> 63c329030
[KARAF-3134] Log executed shell commands at info level
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/63c32903
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/63c32903
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/63c32903
Branch: refs/heads/karaf-2.x
Commit: 63c329030620edae33794636deecee5de4187a89
Parents: 7c290b6
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jul 22 21:39:45 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jul 22 21:39:45 2014 +0200
----------------------------------------------------------------------
.../jline/LoggingCommandSessionListener.java | 45 ++++++++++++++++++++
.../OSGI-INF/blueprint/karaf-console.xml | 6 +++
2 files changed, 51 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/63c32903/shell/console/src/main/java/org/apache/karaf/shell/console/jline/LoggingCommandSessionListener.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/LoggingCommandSessionListener.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/LoggingCommandSessionListener.java
new file mode 100644
index 0000000..85c3520
--- /dev/null
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/LoggingCommandSessionListener.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.karaf.shell.console.jline;
+
+import org.apache.felix.gogo.api.CommandSessionListener;
+import org.apache.felix.service.command.CommandSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoggingCommandSessionListener implements CommandSessionListener {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(LoggingCommandSessionListener.class);
+
+ public void beforeExecute(CommandSession session, CharSequence command) {
+ LOGGER.info("Executing command: '" + command + "'");
+ }
+
+ public void afterExecute(CommandSession session, CharSequence command, Exception exception) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.info("Command: '" + command + "' failed", exception);
+ } else {
+ LOGGER.info("Command: '" + command + "' failed: " + exception);
+ }
+ }
+
+ public void afterExecute(CommandSession session, CharSequence command, Object result) {
+ LOGGER.info("Command: '" + command + "' returned '" + result + "'");
+ }
+}
http://git-wip-us.apache.org/repos/asf/karaf/blob/63c32903/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
----------------------------------------------------------------------
diff --git a/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml b/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
index 48eae07..65c1991 100644
--- a/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
+++ b/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
@@ -118,4 +118,10 @@
<property name="configAdmin" ref="configAdmin"/>
</bean>
<service ref="secureCommandConfigTransformer" interface="org.osgi.service.cm.ConfigurationListener"/>
+
+ <!-- Command execution logging -->
+ <service auto-export="interfaces">
+ <bean class="org.apache.karaf.shell.console.jline.LoggingCommandSessionListener" />
+ </service>
+
</blueprint>