gnuviech/gvaldap
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

reverted Reject handling in ldaptasks

Browse source
This commit is contained in:
Jan Dittberner 2015-01-29 18:41:44 +01:00
parent 5d22e63686
commit 2bca6f687f
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog.rst
View file

@ -1,6 +1,8 @@
Changelog Changelog
========= =========
* :bug:`-` reverted Reject handling in ldaptasks
* release:`0.5.0 <2015-01-29>` * release:`0.5.0 <2015-01-29>`
* :feature:`-` improved logging of ldaptasks * :feature:`-` improved logging of ldaptasks
* :support:`-` update bpython to 0.13.2, add explicit dependency on requests * :support:`-` update bpython to 0.13.2, add explicit dependency on requests

9
gvaldap/ldaptasks/tasks.py
View file

@ -21,12 +21,6 @@ from ldapentities.models import (
_LOGGER = get_task_logger(__name__) _LOGGER = get_task_logger(__name__)
def log_and_reject(exception, message, *args):
logargs = list(args) + [exception.returncode, exception.output]
_LOGGER.error(message + "\nreturncode: %d\noutput:\n%s", *logargs)
raise Reject(message % args, requeue=False)
@shared_task @shared_task
def create_ldap_group(groupname, gid, descr): def create_ldap_group(groupname, gid, descr):
""" """
@ -91,7 +85,8 @@ def create_ldap_user(username, uid, gid, gecos, homedir, shell, password):
try: try:
ldapgroup = LdapGroup.objects.get(gid=gid) ldapgroup = LdapGroup.objects.get(gid=gid)
except ObjectDoesNotExist as exc: except ObjectDoesNotExist as exc:
log_and_reject(exc, 'LDAP group with gid %d does not exist', gid) _LOGGER.error('LDAP group with gid %d does not exist', gid)
raise Reject(exc, requeue=False)
ldapuser.uid = uid ldapuser.uid = uid
ldapuser.group = gid ldapuser.group = gid
ldapuser.gecos = gecos ldapuser.gecos = gecos