Merge changes I9b6c165c,Iae24118a
* changes: Show project name in config push failure log Further clarify the function of SectionSortCache
This commit is contained in:
@@ -450,7 +450,7 @@ public class CommitValidators {
|
|||||||
+ " tried to push an invalid project configuration "
|
+ " tried to push an invalid project configuration "
|
||||||
+ receiveEvent.command.getNewId().name()
|
+ receiveEvent.command.getNewId().name()
|
||||||
+ " for project "
|
+ " for project "
|
||||||
+ receiveEvent.project,
|
+ receiveEvent.project.getName(),
|
||||||
e);
|
e);
|
||||||
throw new CommitValidationException("invalid project configuration", messages);
|
throw new CommitValidationException("invalid project configuration", messages);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,14 @@ import java.util.List;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/** Caches the order AccessSections should be sorted for evaluation. */
|
/**
|
||||||
|
* Caches the order AccessSections should be sorted for evaluation.
|
||||||
|
*
|
||||||
|
* <p>Access specifications for a more specific ref (eg. refs/heads/master rather than refs/heads/*)
|
||||||
|
* take precedence in ACL evaluations. So for each combination of (ref, list of access specs) we
|
||||||
|
* have to order the access specs by their distance from the ref to be matched. This is expensive,
|
||||||
|
* so cache the sorted ordering.
|
||||||
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
public class SectionSortCache {
|
public class SectionSortCache {
|
||||||
private static final Logger log = LoggerFactory.getLogger(SectionSortCache.class);
|
private static final Logger log = LoggerFactory.getLogger(SectionSortCache.class);
|
||||||
|
|||||||
Reference in New Issue
Block a user