Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-04 08:28:44 +02:00
Code Issues Packages Projects Releases Activity

Harmonize logging string for repositories

Browse Source
This commit is contained in:
René Pfeuffer
2020-12-03 09:39:25 +01:00
parent e6a658d3cc
commit eaf59f91c4
32 changed files with 102 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.debug;
import com.github.legman.ReferenceType;
@@ -38,7 +38,7 @@ import javax.inject.Inject;
/**
* {@link PostReceiveRepositoryHookEvent} which stores receives data and passes it to the {@link DebugService}.
*
*
* @author Sebastian Sdorra
*/
@EagerSingleton
@@ -48,12 +48,12 @@ public final class DebugHook
* the logger for DebugHook
*/
private static final Logger LOG = LoggerFactory.getLogger(DebugHook.class);
private final DebugService debugService;
/**
* Constructs a new instance.
*
*
* @param debugService debug service
*/
@Inject
@@ -61,23 +61,23 @@ public final class DebugHook
{
this.debugService = debugService;
}
/**
* Processes the received {@link PostReceiveRepositoryHookEvent} and transforms it to a {@link DebugHookData} and
* Processes the received {@link PostReceiveRepositoryHookEvent} and transforms it to a {@link DebugHookData} and
* passes it to the {@link DebugService}.
*
*
* @param event received event
*/
@Subscribe(referenceType = ReferenceType.STRONG)
public void processEvent(PostReceiveRepositoryHookEvent event){
LOG.trace("store changeset ids from repository", event.getRepository().getId());
LOG.trace("store changeset ids from repository {}", event.getRepository());
debugService.put(
event.getRepository().getNamespaceAndName(),
new DebugHookData(Collections2.transform(
event.getContext().getChangesetProvider().getChangesetList(), IDEXTRACTOR)
));
}
private static final Function<Changeset, String> IDEXTRACTOR = (Changeset changeset) -> changeset.getId();
}

6
scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
View File

@@ -139,7 +139,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
repository.setId(keyGenerator.createKey());
repository.setNamespace(namespaceStrategyProvider.get().createNamespace(repository));
logger.info("create repository {}/{} of type {} in namespace {}", repository.getNamespace(), repository.getName(), repository.getType(), repository.getNamespace());
logger.info("create repository {} of type {}", repository, repository.getType());
return managerDaoAdapter.create(
repository,
@@ -175,7 +175,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
@Override
public void delete(Repository repository) {
logger.info("delete repository {}/{} of type {}", repository.getNamespace(), repository.getName(), repository.getType());
logger.info("delete repository {} of type {}", repository, repository.getType());
managerDaoAdapter.delete(
repository,
() -> RepositoryPermissions.delete(repository),
@@ -201,7 +201,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
@Override
public void modify(Repository repository) {
logger.info("modify repository {}/{} of type {}", repository.getNamespace(), repository.getName(), repository.getType());
logger.info("modify repository {} of type {}", repository, repository.getType());
managerDaoAdapter.modify(
repository,

14
scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
import com.github.sdorra.ssp.PermissionActionCheck;
@@ -84,32 +84,32 @@ public final class HealthChecker {
} else {
logger.debug(
"no permissions to execute health check for repository {}",
repository.getId());
repository);
}
}
}
private void doCheck(Repository repository){
logger.info("start health check for repository {}", repository.getName());
logger.info("start health check for repository {}", repository);
HealthCheckResult result = HealthCheckResult.healthy();
for (HealthCheck check : checks) {
logger.trace("execute health check {} for repository {}",
check.getClass(), repository.getName());
check.getClass(), repository);
result = result.merge(check.check(repository));
}
if (result.isUnhealthy()) {
logger.warn("repository {} is unhealthy: {}", repository.getName(),
logger.warn("repository {} is unhealthy: {}", repository,
result);
} else {
logger.info("repository {} is healthy", repository.getName());
logger.info("repository {} is healthy", repository);
}
if (!(repository.isHealthy() && result.isHealthy())) {
logger.trace("store health check results for repository {}",
repository.getName());
repository);
repository.setHealthCheckFailures(
ImmutableList.copyOf(result.getFailures()));
repositoryManager.modify(repository);

2
scm-webapp/src/main/java/sonia/scm/repository/RepositoryInitializer.java
View File

@@ -70,7 +70,7 @@ public class RepositoryInitializer {
modifyCommandBuilder.setCommitMessage("initialize repository");
String revision = modifyCommandBuilder.execute();
LOG.info("initialized repository {} as revision {}", repository.getNamespaceAndName(), revision);
LOG.info("initialized repository {} as revision {}", repository, revision);
} catch (IOException e) {
throw new InternalRepositoryException(repository, "failed to initialize repository", e);

7
scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
View File

@@ -162,18 +162,17 @@ public class AuthorizationChangedEventProducer {
Repository repository = event.getItem();
if (isAuthorizationDataModified(repository.getPermissions(), event.getItemBeforeModification().getPermissions())) {
logger.debug(
"fire authorization changed event, because the permissions of repository {}/{} have changed", repository.getNamespace(), repository.getName()
"fire authorization changed event, because the permissions of repository {} have changed", repository
);
fireEventForEveryUser();
} else if (!event.getItem().getNamespace().equals(event.getItemBeforeModification().getNamespace())) {
logger.debug(
"fire authorization changed event, because the namespace of repository {}/{} has changed", repository.getNamespace(), repository.getName()
"fire authorization changed event, because the namespace of repository {} has changed", repository
);
fireEventForEveryUser();
} else {
logger.debug(
"authorization changed event is not fired, because non relevant field of repository {}/{} has changed",
repository.getNamespace(), repository.getName()
"authorization changed event is not fired, because non relevant field of repository {} has changed", repository
);
}
}

2
scm-webapp/src/main/java/sonia/scm/security/DefaultAuthorizationCollector.java
View File

@@ -208,7 +208,7 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
if (!hasPermission && logger.isTraceEnabled())
{
logger.trace("no permission for user {} defined at repository {}", user.getName(), repository.getNamespaceAndName());
logger.trace("no permission for user {} defined at repository {}", user.getName(), repository);
}
}

2
scm-webapp/src/main/java/sonia/scm/update/repository/PublicFlagUpdateStep.java
View File

@@ -90,7 +90,7 @@ public class PublicFlagUpdateStep implements UpdateStep {
.forEach(v1Repository -> {
Repository v2Repository = repositoryDAO.get(v1Repository.getId());
if (v2Repository != null) {
LOG.info("Add RepositoryRole 'READ' to _anonymous user for repository: {} - {}/{}", v2Repository.getId(), v2Repository.getNamespace(), v2Repository.getName());
LOG.info("Add RepositoryRole 'READ' to _anonymous user for repository: {}", v2Repository);
v2Repository.addPermission(new RepositoryPermission(v2AnonymousUser.getId(), "READ", false));
repositoryDAO.modify(v2Repository);
} else {

4
scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.update.repository;
import com.google.inject.Injector;
@@ -175,7 +175,7 @@ public class XmlRepositoryV1UpdateStep implements CoreUpdateStep {
v1Repository.getContact(),
v1Repository.getDescription(),
createPermissions(v1Repository));
LOG.info("creating new repository {} with id {} from old repository {} in directory {}", repository.getNamespaceAndName(), repository.getId(), v1Repository.getName(), newPath);
LOG.info("creating new repository {} from old repository {} in directory {}", repository, v1Repository.getName(), newPath);
repositoryDao.add(repository, newPath);
propertyStore.put(v1Repository.getId(), v1Repository.getProperties());
}