Index: modules/univention/s4connector/__init__.py =================================================================== --- modules/univention/s4connector/__init__.py (Revision 82505) +++ modules/univention/s4connector/__init__.py (Arbeitskopie) @@ -748,10 +748,10 @@ return True # file not found so there's nothing to sync except (cPickle.UnpicklingError, EOFError) as e: message = 'file emtpy' if isinstance(e, EOFError) else e.message - ud.debug(ud.LDAP, ud.WARN, + ud.debug(ud.LDAP, ud.ERROR, '__sync_file_from_ucs: invalid pickle file {}: {}'.format(filename, message)) # ignore corrupted pickle file, but save as rejected to not try again - self._save_rejected_ucs(filename, 'unknown') + self._save_rejected_ucs(filename, 'ERROR: broken file') return False if dn == 'cn=Subschema': @@ -1037,6 +1037,8 @@ if rejected: for filename, dn in rejected: + if dn in ('ERROR: broken file',): + continue ud.debug(ud.LDAP, ud.PROCESS, 'sync from ucs: Resync rejected file: %s' % (filename)) try: if self.__sync_file_from_ucs(filename, append_error=' rejected'): @@ -1098,10 +1100,10 @@ continue # file not found so there's nothing to sync except (cPickle.UnpicklingError, EOFError) as e: message = 'file emtpy' if isinstance(e, EOFError) else e.message - ud.debug(ud.LDAP, ud.WARN, + ud.debug(ud.LDAP, ud.ERROR, 'poll_ucs: invalid pickle file {}: {}'.format(filename, message)) # ignore corrupted pickle file, but save as rejected to not try again - self._save_rejected_ucs(filename, 'unknown') + self._save_rejected_ucs(filename, 'ERROR: broken file') continue for i in [0, 1]: # do it twice if the LDAP connection was closed