You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2019/10/12 04:28:08 UTC
[lucene-solr] branch branch_8_3 updated: SOLR-13787: Better error
logging
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch branch_8_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8_3 by this push:
new 4c67f16 SOLR-13787: Better error logging
4c67f16 is described below
commit 4c67f1645ea4e21d0a2fbaaa084c5433faffc751
Author: noble <no...@apache.org>
AuthorDate: Sat Oct 12 15:27:41 2019 +1100
SOLR-13787: Better error logging
---
solr/core/src/java/org/apache/solr/api/AnnotatedApi.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java b/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
index 964af85..e9073ae 100644
--- a/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
+++ b/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
@@ -18,6 +18,7 @@
package org.apache.solr.api;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -44,6 +45,8 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.security.AuthorizationContext;
import org.apache.solr.security.PermissionNameProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class implements an Api just from an annotated java class
@@ -56,6 +59,9 @@ import org.apache.solr.security.PermissionNameProvider;
*/
public class AnnotatedApi extends Api implements PermissionNameProvider {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ public static final String ERR ="Error executing commands :";
private EndPoint endPoint;
private Map<String, Cmd> commands = new HashMap<>();
private final Api fallback;
@@ -155,7 +161,8 @@ public class AnnotatedApi extends Api implements PermissionNameProvider {
List<Map> errs = CommandOperation.captureErrors(cmds);
if (!errs.isEmpty()) {
- throw new ApiBag.ExceptionWithErrObject(SolrException.ErrorCode.BAD_REQUEST, "Error in executing commands", errs);
+ log.error(ERR+ Utils.toJSONString(errs));
+ throw new ApiBag.ExceptionWithErrObject(SolrException.ErrorCode.BAD_REQUEST, ERR , errs);
}
}
@@ -220,7 +227,6 @@ public class AnnotatedApi extends Api implements PermissionNameProvider {
}
if (isWrappedInPayloadObj) {
PayloadObj<Object> payloadObj = new PayloadObj<>(cmd.name, cmd.getCommandData(), o);
- cmd = payloadObj;
method.invoke(obj, req, rsp, payloadObj);
} else {
method.invoke(obj, req, rsp, o);
@@ -260,7 +266,6 @@ public class AnnotatedApi extends Api implements PermissionNameProvider {
public static Map<String, Object> createSchema(Method m) {
Type[] types = m.getGenericParameterTypes();
- Map<String, Object> result;
if (types.length == 3) {
return createSchemaFromType(types[2]);
@@ -297,8 +302,6 @@ public class AnnotatedApi extends Api implements PermissionNameProvider {
JsonProperty p = fld.getAnnotation(JsonProperty.class);
if (p == null) continue;
props.put(p.value(), createSchemaFromType(fld.getGenericType()));
-
-
}
}