pthread_cond_broadcast(&cache_cond);
} /* }}} void sig_term_handler */
-static int write_pidfile (void) /* {{{ */
+static int open_pidfile(void) /* {{{ */
{
- pid_t pid;
- char *file;
int fd;
- FILE *fh;
+ char *file;
- pid = getpid ();
-
file = (config_pid_file != NULL)
? config_pid_file
: LOCALSTATEDIR "/run/rrdcached.pid";
fd = open(file, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IRGRP|S_IROTH);
if (fd < 0)
- {
- RRDD_LOG(LOG_ERR, "FATAL: cannot create '%s' (%s)",
- file, rrd_strerror(errno));
- return (-1);
- }
+ fprintf(stderr, "FATAL: cannot create '%s' (%s)\n",
+ file, rrd_strerror(errno));
+
+ return(fd);
+}
+
+static int write_pidfile (int fd) /* {{{ */
+{
+ pid_t pid;
+ FILE *fh;
+
+ pid = getpid ();
fh = fdopen (fd, "w");
if (fh == NULL)
{
- RRDD_LOG (LOG_ERR, "write_pidfile: Opening `%s' failed.", file);
+ RRDD_LOG (LOG_ERR, "write_pidfile: fdopen() failed.");
close(fd);
return (-1);
}
if (did_insert)
{
+ pthread_cond_broadcast(&cache_cond);
pthread_mutex_lock (&stats_lock);
stats_queue_length++;
pthread_mutex_unlock (&stats_lock);
if (max_age > 0)
cfd.abs_timeout = cfd.now - max_age;
else
- cfd.abs_timeout = cfd.now + 1;
+ cfd.abs_timeout = cfd.now + 2*config_write_jitter + 1;
/* `tree_callback_flush' will return the keys of all values that haven't
* been touched in the last `config_flush_interval' seconds in `cfd'.
/* Enqueue at head */
enqueue_cache_item (ci, HEAD);
- pthread_cond_signal (&cache_cond);
pthread_cond_wait(&ci->flushed, &cache_lock);
pthread_mutex_unlock(&cache_lock);
&& (ci->values_num > 0))
{
enqueue_cache_item (ci, TAIL);
- pthread_cond_signal (&cache_cond);
}
pthread_mutex_unlock (&cache_lock);
static int daemonize (void) /* {{{ */
{
int status;
+ int fd;
/* These structures are static, because `sigaction' behaves weird if the are
* overwritten.. */
static struct sigaction sa_term;
static struct sigaction sa_pipe;
+ fd = open_pidfile();
+ if (fd < 0) return fd;
+
if (!stay_foreground)
{
pid_t child;
return (-1);
}
- status = write_pidfile ();
+ status = write_pidfile (fd);
return status;
} /* }}} int daemonize */