cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-10 16:04:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

only write last-login files for e-mail address directories

Browse Source
This commit is contained in:
holger krekel
2024-07-22 14:31:46 +02:00
parent 353d3bfb3f
commit 1b3e2b32f2
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chatmaild/src/chatmaild/lastlogin.py
View File

@@ -29,6 +29,8 @@ def write_last_login_to_userdir(userdir, timestamp):
def get_last_login_from_userdir(userdir) -> int: def get_last_login_from_userdir(userdir) -> int:
if "@" not in userdir.name:
return get_daytimestamp(time.time())
target = userdir.joinpath(LAST_LOGIN) target = userdir.joinpath(LAST_LOGIN)
try: try:
return int(target.stat().st_mtime) return int(target.stat().st_mtime)

9
chatmaild/src/chatmaild/tests/test_delete_inactive_users.py
View File

@@ -6,7 +6,7 @@ from chatmaild.lastlogin import get_last_login_from_userdir, write_last_login_to
def test_login_timestamps(tmp_path): def test_login_timestamps(tmp_path):
userdir = tmp_path.joinpath("someuser") userdir = tmp_path.joinpath("someuser@chat.example.org")
userdir.mkdir() userdir.mkdir()
write_last_login_to_userdir(userdir, timestamp=100000) write_last_login_to_userdir(userdir, timestamp=100000)
assert get_last_login_from_userdir(userdir) == 86400 assert get_last_login_from_userdir(userdir) == 86400
@@ -18,6 +18,13 @@ def test_login_timestamps(tmp_path):
assert get_last_login_from_userdir(userdir) == 86400 * 2 assert get_last_login_from_userdir(userdir) == 86400 * 2
def test_delete_skips_non_email_dir(db, example_config):
userdir = example_config.get_user_maildir("something")
userdir.mkdir()
get_last_login_from_userdir(userdir)
assert not list(userdir.iterdir())
def test_delete_inactive_users(db, example_config): def test_delete_inactive_users(db, example_config):
new = time.time() new = time.time()
old = new - (example_config.delete_inactive_users_after * 86400) - 1 old = new - (example_config.delete_inactive_users_after * 86400) - 1