Author: jmssiera
Date: Mon Sep 26 09:54:11 2022
New Revision: 1904267
URL: http://svn.apache.org/viewvc?rev=1904267&view=rev
Log:
CONNECTORS-1734: Add space and user details in error logs of Confluence
authority
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java?rev=1904267&r1=1904266&r2=1904267&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java
Mon Sep 26 09:54:11 2022
@@ -860,12 +860,12 @@ public class ConfluenceClient {
throw new ConfluenceException("Confluence error. " +
response.getStatusLine().getStatusCode() + " " +
response.getStatusLine().getReasonPhrase());
}
final HttpEntity entity = response.getEntity();
- final List<String> permissions = permissionsFromHttpEntity(entity);
+ final List<String> permissions = permissionsFromHttpEntity(entity,
space.getName(), username);
EntityUtils.consume(entity);
return permissions;
}
- private List<String> permissionsFromHttpEntity(final HttpEntity entity)
throws Exception {
+ private List<String> permissionsFromHttpEntity(final HttpEntity entity,
final String space, final String username) throws Exception {
final String stringEntity = EntityUtils.toString(entity, "UTF-8");
final JSONParser parser = new JSONParser();
final Object parsedReponse = parser.parse(new StringReader(stringEntity));
@@ -881,7 +881,7 @@ public class ConfluenceClient {
final JSONObject error = (JSONObject) responseObject.get("error");
final String message = error.get("message").toString();
// Probably has no permissions to get this space's permissions
- logger.warn("Confluence authority: Can't get user permissions; " +
message);
+ logger.warn("Confluence authority: Can't get permissions of user '" +
username + "' for space '" + space + "'; " + message);
return new ArrayList<>(0);
} else {
throw new Exception("Unexpected JSON format: " + responseObject);
Modified:
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java?rev=1904267&r1=1904266&r2=1904267&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
(original)
+++
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
Mon Sep 26 09:54:11 2022
@@ -685,7 +685,7 @@ public class ConfluenceClient {
+ response.getStatusLine().getReasonPhrase());
}
HttpEntity entity = response.getEntity();
- List<String> permissions = permissionsFromHttpEntity(entity);
+ List<String> permissions = permissionsFromHttpEntity(entity,
space.getName(), username);
EntityUtils.consume(entity);
return permissions;
}
@@ -699,7 +699,7 @@ public class ConfluenceClient {
return response;
}
- private List<String> permissionsFromHttpEntity(HttpEntity entity) throws
Exception {
+ private List<String> permissionsFromHttpEntity(final HttpEntity entity,
final String space, final String username) throws Exception {
String stringEntity = EntityUtils.toString(entity, "UTF-8");
final JSONParser parser = new JSONParser();
final Object parsedReponse = parser.parse(new StringReader(stringEntity));
@@ -715,7 +715,7 @@ public class ConfluenceClient {
final JSONObject error = (JSONObject) responseObject.get("error");
final String message = error.get("message").toString();
// Probably has no permissions to get this space's permissions
- logger.warn("Confluence authority: Can't get user permissions;
"+message);
+ logger.warn("Confluence authority: Can't get permissions of user '" +
username + "' for space '" + space + "'; " + message);
return new ArrayList<>(0);
} else {
throw new Exception("Unexpected JSON format: " + responseObject);
