diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index c84b774..d99dbf7 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -9,6 +9,7 @@ * Update for ldap3 2.x. * Rename project to ldap-passwd-webui. +* Use `logging` module for logging instead of `print()`. == link:{tags}/v1.0.0[1.0.0] (2017-06-06) diff --git a/app.py b/app.py index 3086212..7c89315 100755 --- a/app.py +++ b/app.py @@ -8,9 +8,13 @@ from ldap3 import SIMPLE, SUBTREE from ldap3.core.exceptions import LDAPBindError, LDAPConstraintViolationResult, \ LDAPInvalidCredentialsResult, LDAPUserNameIsMandatoryError +import logging import os from os import path +LOG = logging.getLogger(__name__) +LOG_FORMAT = '%(asctime)s %(levelname)s: %(message)s' + @get('/') def get_index(): @@ -33,10 +37,10 @@ try: change_password(form('username'), form('old-password'), form('new-password')) except Error as e: - print("Unsuccessful attemp to change password for %s: %s" % (form('username'), e)) + LOG.warning("Unsuccessful attemp to change password for %s: %s" % (form('username'), e)) return error(str(e)) - print("Password successfully changed for: %s" % form('username')) + LOG.info("Password successfully changed for: %s" % form('username')) return index_tpl(alerts=[('success', "Password has been changed")]) @@ -112,6 +116,10 @@ pass +# Set up logging. +logging.basicConfig(format=LOG_FORMAT) +LOG.setLevel(logging.INFO) + BASE_DIR = path.dirname(__file__) CONF = read_config()