mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-08 09:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move cache_prepare() to cgit

Browse Source 
This moves some cgit-specific stuff away from cache.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2007-01-12 00:00:15 +01:00
parent f98e72684b
commit 83a5f35a27
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cache.c
View File

@ -10,28 +10,6 @@
const int NOLOCK = -1; const int NOLOCK = -1;
void cache_prepare(struct cacheitem *item)
{
if (!cgit_query_repo) {
item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
item->ttl = cgit_cache_root_ttl;
} else if (!cgit_query_page) {
item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
cgit_query_repo));
item->ttl = cgit_cache_repo_ttl;
} else {
item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
cgit_query_repo, cgit_query_page,
cgit_querystring));
if (cgit_query_has_symref)
item->ttl = cgit_cache_dynamic_ttl;
else if (cgit_query_has_sha1)
item->ttl = cgit_cache_static_ttl;
else
item->ttl = cgit_cache_repo_ttl;
}
}
int cache_exist(struct cacheitem *item) int cache_exist(struct cacheitem *item)
{ {
if (stat(item->name, &item->st)) { if (stat(item->name, &item->st)) {

25
cgit.c
View File

@ -10,6 +10,28 @@
const char cgit_version[] = CGIT_VERSION; const char cgit_version[] = CGIT_VERSION;
static void cgit_prepare_cache(struct cacheitem *item)
{
if (!cgit_query_repo) {
item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
item->ttl = cgit_cache_root_ttl;
} else if (!cgit_query_page) {
item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
cgit_query_repo));
item->ttl = cgit_cache_repo_ttl;
} else {
item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
cgit_query_repo, cgit_query_page,
cgit_querystring));
if (cgit_query_has_symref)
item->ttl = cgit_cache_dynamic_ttl;
else if (cgit_query_has_sha1)
item->ttl = cgit_cache_static_ttl;
else
item->ttl = cgit_cache_repo_ttl;
}
}
static void cgit_print_repo_page(struct cacheitem *item) static void cgit_print_repo_page(struct cacheitem *item)
{ {
if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) ||
@ -63,7 +85,6 @@ static void cgit_check_cache(struct cacheitem *item)
{ {
int i = 0; int i = 0;
cache_prepare(item);
top: top:
if (++i > cgit_max_lock_attempts) { if (++i > cgit_max_lock_attempts) {
die("cgit_refresh_cache: unable to lock %s: %s", die("cgit_refresh_cache: unable to lock %s: %s",
@ -152,8 +173,8 @@ int main(int argc, const char **argv)
cgit_parse_args(argc, argv); cgit_parse_args(argc, argv);
cgit_parse_query(cgit_querystring, cgit_querystring_cb); cgit_parse_query(cgit_querystring, cgit_querystring_cb);
cgit_prepare_cache(&item);
if (cgit_nocache) { if (cgit_nocache) {
cache_prepare(&item);
item.fd = STDOUT_FILENO; item.fd = STDOUT_FILENO;
cgit_fill_cache(&item); cgit_fill_cache(&item);
} else { } else {

1
cgit.h
View File

@ -87,7 +87,6 @@ extern int cgit_read_config(const char *filename, configfn fn);
extern int cgit_parse_query(char *txt, configfn fn); extern int cgit_parse_query(char *txt, configfn fn);
extern struct commitinfo *cgit_parse_commit(struct commit *commit); extern struct commitinfo *cgit_parse_commit(struct commit *commit);
extern void cache_prepare(struct cacheitem *item);
extern int cache_lock(struct cacheitem *item); extern int cache_lock(struct cacheitem *item);
extern int cache_unlock(struct cacheitem *item); extern int cache_unlock(struct cacheitem *item);
extern int cache_cancel_lock(struct cacheitem *item); extern int cache_cancel_lock(struct cacheitem *item);