| -rw-r--r-- | cache.c | 5 | ||||
| -rw-r--r-- | cgit.c | 14 | ||||
| -rw-r--r-- | cgit.h | 1 |
3 files changed, 4 insertions, 16 deletions
@@ -99,11 +99,6 @@ int cache_unlock(struct cacheitem *item) return (rename(fmt("%s.lock", item->name), item->name) == 0); } -int cache_cancel_lock(struct cacheitem *item) -{ - return (unlink(fmt("%s.lock", item->name)) == 0); -} - int cache_expired(struct cacheitem *item) { if (item->ttl < 0) @@ -61,19 +61,13 @@ static void cgit_check_cache(struct cacheitem *item) sleep(1); goto top; } - if (!cache_exist(item)) { + if (!cache_exist(item)) cgit_fill_cache(item); - cache_unlock(item); - } else { - cache_cancel_lock(item); - } + cache_unlock(item); } else if (cache_expired(item) && cache_lock(item)) { - if (cache_expired(item)) { + if (cache_expired(item)) cgit_fill_cache(item); - cache_unlock(item); - } else { - cache_cancel_lock(item); - } + cache_unlock(item); } } @@ -66,7 +66,6 @@ extern int cgit_parse_query(char *txt, configfn fn); extern void cache_prepare(struct cacheitem *item); extern int cache_lock(struct cacheitem *item); extern int cache_unlock(struct cacheitem *item); -extern int cache_cancel_lock(struct cacheitem *item); extern int cache_exist(struct cacheitem *item); extern int cache_expired(struct cacheitem *item); |