projects
/
collection4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/graph_list.c: Honor the "CacheFile" option.
[collection4.git]
/
src
/
graph_list.c
diff --git
a/src/graph_list.c
b/src/graph_list.c
index
d767ef9
..
1614307
100644
(file)
--- a/
src/graph_list.c
+++ b/
src/graph_list.c
@@
-55,7
+55,6
@@
* Defines
*/
#define UPDATE_INTERVAL 900
* Defines
*/
#define UPDATE_INTERVAL 900
-#define CACHE_FILE "/tmp/collection4.json"
/*
* Global variables
/*
* Global variables
@@
-210,7
+209,7
@@
static int gl_register_file (const graph_ident_t *file, /* {{{ */
return (0);
} /* }}} int gl_register_file */
return (0);
} /* }}} int gl_register_file */
-static int gl_register_ident (
const
graph_ident_t *ident, /* {{{ */
+static int gl_register_ident (graph_ident_t *ident, /* {{{ */
__attribute__((unused)) void *user_data)
{
/* TODO: Check for duplicates if multiple data providers are used. */
__attribute__((unused)) void *user_data)
{
/* TODO: Check for duplicates if multiple data providers are used. */
@@
-269,13
+268,14
@@
static int gl_update_cache (void) /* {{{ */
int fd;
yajl_gen handler;
yajl_gen_config handler_config = { /* pretty = */ 1, /* indent = */ " " };
int fd;
yajl_gen handler;
yajl_gen_config handler_config = { /* pretty = */ 1, /* indent = */ " " };
+ const char *cache_file = graph_config_get_cachefile ();
struct flock lock;
struct stat statbuf;
int status;
size_t i;
memset (&statbuf, 0, sizeof (statbuf));
struct flock lock;
struct stat statbuf;
int status;
size_t i;
memset (&statbuf, 0, sizeof (statbuf));
- status = stat (
CACHE_FILE
, &statbuf);
+ status = stat (
cache_file
, &statbuf);
if (status == 0)
{
if (statbuf.st_mtime >= gl_last_update)
if (status == 0)
{
if (statbuf.st_mtime >= gl_last_update)
@@
-290,7
+290,7
@@
static int gl_update_cache (void) /* {{{ */
/* Continue writing the file if possible. */
}
/* Continue writing the file if possible. */
}
- fd = open (
CACHE_FILE
, O_WRONLY | O_TRUNC | O_CREAT,
+ fd = open (
cache_file
, O_WRONLY | O_TRUNC | O_CREAT,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
if (fd < 0)
{
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
if (fd < 0)
{
@@
-620,7
+620,7
@@
static int gl_read_cache (_Bool block) /* {{{ */
int status;
time_t now;
int status;
time_t now;
- fd = open (
CACHE_FILE
, O_RDONLY);
+ fd = open (
graph_config_get_cachefile ()
, O_RDONLY);
if (fd < 0)
{
fprintf (stderr, "gl_read_cache: open(2) failed with status %i\n", errno);
if (fd < 0)
{
fprintf (stderr, "gl_read_cache: open(2) failed with status %i\n", errno);