2 commits - pykolab/auth pykolab/logger.py
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Thu Sep 11 00:40:19 CEST 2014
pykolab/auth/ldap/__init__.py | 9 ++++++++-
pykolab/logger.py | 30 ++++++++++++------------------
2 files changed, 20 insertions(+), 19 deletions(-)
New commits:
commit c8e843ce00f0e9d1f91ec1cb8575370a6508b173
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Sep 11 00:39:58 2014 +0200
Adjust logger.py to not bail on --user=$x not being actual users
diff --git a/pykolab/logger.py b/pykolab/logger.py
index cce43f5..51f3e12 100644
--- a/pykolab/logger.py
+++ b/pykolab/logger.py
@@ -135,12 +135,8 @@ class Logger(logging.Logger):
group_members
) = grp.getgrnam(self.process_groupname)
- except KeyError:
- print >> sys.stderr, _("Group %s does not exist") % (
- self.process_groupname
- )
-
- sys.exit(1)
+ except KeyError, errmsg:
+ group_name = False
if ruid == 0:
# Means we haven't switched yet.
@@ -155,21 +151,19 @@ class Logger(logging.Logger):
user_shell
) = pwd.getpwnam(self.process_username)
- except KeyError:
- print >> sys.stderr, _("User %s does not exist") % (
- self.process_username
- )
-
- sys.exit(1)
+ except KeyError, errmsg:
+ user_name = False
if os.path.isfile(self.logfile):
try:
- os.chown(
- self.logfile,
- user_uid,
- group_gid
- )
- os.chmod(self.logfile, 0660)
+ if not user_uid == 0 or group_gid = 0:
+ os.chown(
+ self.logfile,
+ user_uid,
+ group_gid
+ )
+ os.chmod(self.logfile, 0660)
+
except Exception, errmsg:
self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
if self.debuglevel > 8:
commit 8afe6d324b5baad759ed17128be39be1580bae69
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Tue Sep 9 20:54:44 2014 +0200
Decrease the logging verbosity
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index b9d0749..1b0c941 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -592,7 +592,14 @@ class LDAP(pykolab.base.Base):
daemon_rcpt_policy = self.config_get('daemon_rcpt_policy')
if not utils.true_or_false(daemon_rcpt_policy) and not daemon_rcpt_policy == None:
- log.info(_("Applying recipient policy disabled through configuration"))
+ log.debug(
+ _(
+ "Not applying recipient policy for %s " + \
+ "(disabled through configuration)"
+ ) % (entry_dn),
+ level=1
+ )
+
return entry_modifications
want_attrs = []
More information about the commits
mailing list