// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.

package jodd.madvoc.interceptor;

import jodd.madvoc.ActionRequest;
import jodd.madvoc.ResponseException;
import jodd.madvoc.result.JsonResult;
import jodd.util.net.HttpStatus;

public class JsonErrorInterceptor implements ActionInterceptor {

	@Override
	public Object intercept(final ActionRequest actionRequest) {
		try {
			return actionRequest.invoke();
		}
		catch (ResponseException rex) {
			return JsonResult.of(HttpStatus.of(rex.getStatus(), rex.getMessage()));
		}
		catch (Exception ex) {
			return JsonResult.of(ex);
		}
	}
}

@@ -1410,16 +1410,71 @@
 eptor;%0A%0A
+import jodd.log.Logger;%0Aimport jodd.log.LoggerFactory;%0A
 import j
@@ -1613,72 +1613,283 @@
 s;%0A%0A
-public class JsonErrorInterceptor implements ActionInterceptor %7B
+/**%0A * Interceptor of REST actions. Catches exceptions, logs the errors and returns exception information in the body.%0A */%0Apublic class JsonErrorInterceptor implements ActionInterceptor %7B%0A%09private static final Logger log = LoggerFactory.getLogger(JsonErrorInterceptor.class);
 %0A%0A%09@
@@ -2139,24 +2139,70 @@
 ption ex) %7B%0A
+%09%09%09log.error(%22Action execution failed:%22, ex);%0A
 %09%09%09return Js

Add exception logging! (closes #618)