From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/service/LdapSyncService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/service/LdapSyncService.java b/src/main/java/com/gitblit/service/LdapSyncService.java
index 84d478a..7ae19aa 100644
--- a/src/main/java/com/gitblit/service/LdapSyncService.java
+++ b/src/main/java/com/gitblit/service/LdapSyncService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 gitblit.com.
+ * Copyright 2014 gitblit.com.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
/**
* @author Alfred Schmid
- *
+ *
*/
public final class LdapSyncService implements Runnable {
@@ -44,21 +44,26 @@
}
/**
- *
+ *
* @see java.lang.Runnable#run()
*/
@Override
public void run() {
logger.info("Starting user and group sync with ldap service");
if (!running.getAndSet(true)) {
- ldapAuthProvider.synchronizeWithLdapService();
- running.getAndSet(false);
+ try {
+ ldapAuthProvider.sync();
+ } catch (Exception e) {
+ logger.error("Failed to synchronize with ldap", e);
+ } finally {
+ running.getAndSet(false);
+ }
}
logger.info("Finished user and group sync with ldap service");
}
public boolean isReady() {
- return settings.getBoolean(Keys.realm.ldap.synchronizeUsers.enable, false);
+ return settings.getBoolean(Keys.realm.ldap.synchronize, false);
}
}
--
Gitblit v1.9.1