From c78b5cbea20ef9b52d149e6a3a2eb998bc399a5f Mon Sep 17 00:00:00 2001 From: jkoberg Date: Wed, 21 Jun 2023 11:18:19 +0200 Subject: [PATCH] don't connect ldap on startup Signed-off-by: jkoberg --- changelog/unreleased/dont-connect-ldap-on-startup.md | 5 +++++ pkg/utils/ldap/reconnect.go | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 changelog/unreleased/dont-connect-ldap-on-startup.md diff --git a/changelog/unreleased/dont-connect-ldap-on-startup.md b/changelog/unreleased/dont-connect-ldap-on-startup.md new file mode 100644 index 0000000000..395f97caab --- /dev/null +++ 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 index 13a9136523..684d6d60d0 100644 --- 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")