karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject git commit: [KARAF-3134] Log executed shell commands at debug level
Date Tue, 22 Jul 2014 20:12:08 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 46d8b67f0 -> 5aa52af21


[KARAF-3134] Log executed shell commands at debug level

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5aa52af2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5aa52af2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5aa52af2

Branch: refs/heads/karaf-3.0.x
Commit: 5aa52af21e35667de90ac4e3b094851e7648d4fb
Parents: 46d8b67
Author: Guillaume Nodet <gnodet@gmail.com>
Authored: Tue Jul 22 22:11:55 2014 +0200
Committer: Guillaume Nodet <gnodet@gmail.com>
Committed: Tue Jul 22 22:11:55 2014 +0200

----------------------------------------------------------------------
 .../jline/LoggingCommandSessionListener.java    | 45 ++++++++++++++++++++
 .../OSGI-INF/blueprint/karaf-console.xml        |  5 +++
 2 files changed, 50 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/5aa52af2/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..64afa94
--- /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.debug("Executing command: '" + command + "'");
+    }
+
+    public void afterExecute(CommandSession session, CharSequence command, Exception exception)
{
+        if (LOGGER.isTraceEnabled()) {
+            LOGGER.debug("Command: '" + command + "' failed", exception);
+        } else {
+            LOGGER.debug("Command: '" + command + "' failed: " + exception);
+        }
+    }
+
+    public void afterExecute(CommandSession session, CharSequence command, Object result)
{
+        LOGGER.debug("Command: '" + command + "' returned '" + result + "'");
+    }
+}

http://git-wip-us.apache.org/repos/asf/karaf/blob/5aa52af2/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 bbe0c5b..e37ff4b 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
@@ -82,4 +82,9 @@
     </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>


Mime
View raw message