From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 7 May 2019 10:16:24 +0000 (+0100)
Subject: accounts: Log time it takes to run an LDAP query
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0c9d237bef9422596bf4495db4890d0b6c765bd;p=ipfire.org.git

accounts: Log time it takes to run an LDAP query

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 4707aaa7..c278c07d 100644
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -10,6 +10,7 @@ import ldap.modlist
 import logging
 import phonenumbers
 import sshpubkeys
+import time
 import urllib.parse
 import urllib.request
 import zxcvbn
@@ -51,14 +52,13 @@ class Accounts(Object):
 	def _query(self, query, attrlist=None, limit=0):
 		logging.debug("Performing LDAP query: %s" % query)
 
-		try:
-			results = self.ldap.search_ext_s(self.search_base, ldap.SCOPE_SUBTREE,
-				query, attrlist=attrlist, sizelimit=limit)
-		except:
-			# Close current connection
-			del self.ldap
+		t = time.time()
+
+		results = self.ldap.search_ext_s(self.search_base, ldap.SCOPE_SUBTREE,
+			query, attrlist=attrlist, sizelimit=limit)
 
-			raise
+		# Log time it took to perform the query
+		logging.debug("Query took %.2fms" % ((time.time() - t) * 1000.0))
 
 		return results