[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/63e1146f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/63e1146f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/63e1146f
Branch: refs/heads/master Commit: 63e1146f643fb363d2af4cd6fac0dc51a94c1d85 Parents: 666ce66 Author: Guillaume Nodet <[email protected]> Authored: Tue Jul 22 22:04:53 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Tue Jul 22 22:04:53 2014 +0200 ---------------------------------------------------------------------- .../shell/impl/console/osgi/Activator.java | 1 + .../osgi/LoggingCommandSessionListener.java | 45 ++++++++++++++++++++ 2 files changed, 46 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/63e1146f/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java index 9c328d4..597caf7 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java @@ -55,6 +55,7 @@ public class Activator implements BundleActivator { sessionFactory = new SecuredSessionFactoryImpl(context, threadIO); sessionFactory.getCommandProcessor().addConverter(new Converters(context)); sessionFactory.getCommandProcessor().addConstant(".context", context.getBundle(0).getBundleContext()); + sessionFactory.getCommandProcessor().addListener(new LoggingCommandSessionListener()); try { EventAdminListener listener = new EventAdminListener(context); sessionFactory.getCommandProcessor().addListener(listener); http://git-wip-us.apache.org/repos/asf/karaf/blob/63e1146f/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LoggingCommandSessionListener.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LoggingCommandSessionListener.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LoggingCommandSessionListener.java new file mode 100644 index 0000000..3cd52f2 --- /dev/null +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/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.impl.console.osgi; + +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 + "'"); + } +}
