sum7
/
ejabberd-tools
2
1
Fork 0
Code Issues 1 Pull Requests 1 Projects 1 Releases Wiki Activity

fix datetime in cleanup.py #2

Manually merged
sum7 merged 2 commits from fix-datetime into master 2021-04-17 17:53:42 +02:00
Conversation 0 Commits 2 Files Changed 2 +17 -3
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 92f91dcf34 - Show all commits

20
cleanup.py
View File

@ -16,6 +16,9 @@ class EjabberdCleanup(EjabberdApiCalls):
self.delete_not_login = True self.delete_not_login = True
self.offline_since_days = None self.offline_since_days = None
def calc_time_before(self):
return datetime.datetime.now() - datetime.timedelta(days=self.offline_since_days);
def delete_user(self, host, user, reason=""): def delete_user(self, host, user, reason=""):
if self.dry: if self.dry:
logging.warning(f"{user}@{host}: dry delete : {reason}") logging.warning(f"{user}@{host}: dry delete : {reason}")
@ -44,13 +47,24 @@ class EjabberdCleanup(EjabberdApiCalls):
except ValueError as err: except ValueError as err:
logging.error(f"{user}@{host}: not able to parse '{last_stamp}': {err}") logging.error(f"{user}@{host}: not able to parse '{last_stamp}': {err}")
return return
if lastdate is not None and lastdate - datetime.datetime.now() > datetime.timedelta( if lastdate is None:
days=self.offline_since_days logging.error(f"{user}@{host}: not able to parse '{last_stamp}'")
): return
elif lastdate < self.calc_time_before():
self.delete_user(host, user, f"last seen @ {lastdate}") self.delete_user(host, user, f"last seen @ {lastdate}")
return return
else:
logging.debug(f"{user}@{host}: keep @ {lastdate}")
return
logging.debug(f"{user}@{host}: keep")
def run(self): def run(self):
logging.debug("run with:")
logging.debug(f"dry: {self.dry}")
logging.debug(f"skip by roster: {self.skip_by_roster}")
logging.debug(f"delete not login: {self.delete_not_login}")
logging.debug(f"offline since days: {self.offline_since_days}")
for host in self.fetch_vhosts(): for host in self.fetch_vhosts():
if host in self.ignore_hosts: if host in self.ignore_hosts:
continue continue