Merge pull request #4003 from kobergj/DontConnectLdapOnStartup

Don't connect to ldap on startup
cs3org · Jun 21, 2023 · a4c9718 · a4c9718
2 parents dd630b4 + c78b5cb
commit a4c9718
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/changelog/unreleased/dont-connect-ldap-on-startup.md b/changelog/unreleased/dont-connect-ldap-on-startup.md
@@ -0,0 +1,5 @@
+Bugfix: Don't connect ldap on startup
+
+This leads to misleading error messages. Instead connect on first request.
+
+https://github.com/cs3org/reva/pull/4003
diff --git a/pkg/utils/ldap/reconnect.go b/pkg/utils/ldap/reconnect.go
@@ -163,10 +163,10 @@ func (c *ConnWithReconnect) getConnection() (*ldap.Conn, error) {
 }
 
 func (c *ConnWithReconnect) ldapAutoConnect(config Config) {
-	l, err := c.ldapConnect(config)
-	if err != nil {
-		c.logger.Debug().Err(err).Msg("autoconnect could not get ldap Connection")
-	}
+	var (
+		l   *ldap.Conn
+		err error
+	)
 
 	for {
 		select {
@@ -203,7 +203,7 @@ func (c *ConnWithReconnect) ldapConnect(config Config) (*ldap.Conn, error) {
 	}
 
 	if err != nil {
-		c.logger.Debug().Err(err).Msg("could not get ldap Connection")
+		c.logger.Error().Err(err).Msg("could not get ldap Connection")
 		return nil, err
 	}
 	c.logger.Debug().Msg("LDAP Connected")