commit b199f22
default
·
2023-11-08 17:15:51 +0000 UTC
parent 42629c9
Tag indexes are also purged.
2 files changed,
+22,
-4
M
data.c
M
data.c
+19,
-1
1@@ -2498,7 +2498,25 @@ void purge_server(void)
2 xs *itl_fn = xs_fmt("%s/public.idx", srv_basedir);
3 int itl_gc = index_gc(itl_fn);
4
5- srv_debug(1, xs_fmt("purge: global (obj: %d, idx: %d, itl: %d)", cnt, icnt, itl_gc));
6+ /* purge tag indexes */
7+ xs *tag_spec = xs_fmt("%s/tag/??", srv_basedir);
8+ xs *tag_dirs = xs_glob(tag_spec, 0, 0);
9+ p = tag_dirs;
10+
11+ int tag_gc = 0;
12+ while (xs_list_iter(&p, &v)) {
13+ xs *spec2 = xs_fmt("%s/" "*.idx", v);
14+ xs *files = xs_glob(spec2, 0, 0);
15+ xs_list *p2;
16+ xs_str *v2;
17+
18+ p2 = files;
19+ while (xs_list_iter(&p2, &v2))
20+ tag_gc += index_gc(v2);
21+ }
22+
23+ srv_debug(1, xs_fmt("purge: global "
24+ "(obj: %d, idx: %d, itl: %d, tag: %d)", cnt, icnt, itl_gc, tag_gc));
25 }
26
27
+3,
-3
1@@ -1028,13 +1028,13 @@ int process_auth_token(snac *snac, const xs_dict *req)
2 /* this counts as a 'login' */
3 lastlog_write(snac, "mastoapi");
4
5- srv_debug(2, xs_fmt("mastoapi auth: valid token for user %s", uid));
6+ srv_debug(2, xs_fmt("mastoapi auth: valid token for user '%s'", uid));
7 }
8 else
9- srv_log(xs_fmt("mastoapi auth: corrupted token %s", tokid));
10+ srv_log(xs_fmt("mastoapi auth: corrupted token '%s'", tokid));
11 }
12 else
13- srv_log(xs_fmt("mastoapi auth: invalid token %s", tokid));
14+ srv_log(xs_fmt("mastoapi auth: invalid token '%s'", tokid));
15 }
16
17 return logged_in;