/* forward declaration */
static pid_t run_process(const char *path, ...);
-static void kill_childs(int count, int sig, ...);
+static void kill_childs(int sig, ...);
/* static variables */
static AFPObj obj;
static sig_atomic_t got_chldsig;
-static pid_t afpd_pid = -1, cnid_metad_pid = -1;
-static uint afpd_restarts, cnid_metad_restarts;
+static pid_t afpd_pid = -1, cnid_metad_pid = -1, dbus_pid = -1;
+static uint afpd_restarts, cnid_metad_restarts, dbus_restarts;
static struct event_base *base;
-struct event *sigterm_ev, *sigquit_ev, *sigchld_ev;
+struct event *sigterm_ev, *sigquit_ev, *sigchld_ev, *timer_ev;
static int in_shutdown;
+static const char *dbus_path;
/******************************************************************
* libevent helper functions
/* SIGTERM callback */
static void sigterm_cb(evutil_socket_t fd, short what, void *arg)
{
- LOG(log_note, logtype_afpd, "Exiting on SIGTERM");
+ sigset_t sigs;
+ struct timeval tv;
+
+ LOG(log_info, logtype_afpd, "Exiting on SIGTERM");
+
+ if (in_shutdown)
+ return;
in_shutdown = 1;
- event_base_loopbreak(base);
+
+ /* block any signal but SIGCHLD */
+ sigfillset(&sigs);
+ sigdelset(&sigs, SIGCHLD);
+ sigprocmask(SIG_SETMASK, &sigs, NULL);
+
+ /* add 10 sec timeout timer, remove all events but SIGCHLD */
+ tv.tv_sec = KILL_GRACETIME;
+ tv.tv_usec = 0;
+ event_base_loopexit(base, &tv);
+ event_del(sigterm_ev);
+ event_del(sigquit_ev);
+ event_del(timer_ev);
+
+ system("tracker-control -t");
+ kill_childs(SIGTERM, &afpd_pid, &cnid_metad_pid, &dbus_pid, NULL);
}
/* SIGQUIT callback */
static void sigquit_cb(evutil_socket_t fd, short what, void *arg)
{
LOG(log_note, logtype_afpd, "Exiting on SIGQUIT");
- in_shutdown = 1;
- event_base_loopbreak(base);
+ system("tracker-control -t");
+ kill_childs(SIGQUIT, &afpd_pid, &cnid_metad_pid, &dbus_pid, NULL);
}
/* SIGCHLD callback */
int status, i;
pid_t pid;
- LOG(log_debug, logtype_afpd, "Got SIGCHLD event");
-
while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
if (WIFEXITED(status)) {
if (WEXITSTATUS(status))
- LOG(log_info, logtype_afpd, "child[%d]: exited %d", pid, WEXITSTATUS(status));
+ LOG(log_info, logtype_default, "child[%d]: exited %d", pid, WEXITSTATUS(status));
else
- LOG(log_info, logtype_afpd, "child[%d]: done", pid);
+ LOG(log_info, logtype_default, "child[%d]: done", pid);
} else {
if (WIFSIGNALED(status))
- LOG(log_info, logtype_afpd, "child[%d]: killed by signal %d", pid, WTERMSIG(status));
+ LOG(log_info, logtype_default, "child[%d]: killed by signal %d", pid, WTERMSIG(status));
else
- LOG(log_info, logtype_afpd, "child[%d]: died", pid);
+ LOG(log_info, logtype_default, "child[%d]: died", pid);
}
- if (pid == afpd_pid) {
- if (in_shutdown) {
- afpd_pid = -1;
- } else {
- sleep(1);
- afpd_restarts++;
- LOG(log_note, logtype_afpd, "Restarting 'afpd' (restarts: %u)", afpd_restarts);
- if ((afpd_pid = run_process(_PATH_AFPD, "-d", "-F", obj.options.configfile, NULL)) == -1) {
- LOG(log_error, logtype_afpd, "Error starting 'afpd'");
- }
- }
- } else if (pid = cnid_metad_pid) {
- if (in_shutdown) {
- cnid_metad_pid = -1;
- } else {
- sleep(1);
- cnid_metad_restarts++;
- LOG(log_note, logtype_afpd, "Restarting 'cnid_metad' (restarts: %u)", cnid_metad_restarts);
- if ((cnid_metad_pid = run_process(_PATH_CNID_METAD, "-d", "-F", obj.options.configfile, NULL)) == -1) {
- LOG(log_error, logtype_afpd, "Error starting 'cnid_metad'");
- }
- }
- } else {
+ if (pid == afpd_pid)
+ afpd_pid = -1;
+ else if (pid == cnid_metad_pid)
+ cnid_metad_pid = -1;
+ else if (pid == dbus_pid)
+ dbus_pid = -1;
+ else
LOG(log_error, logtype_afpd, "Bad pid: %d", pid);
- }
}
- if (in_shutdown && afpd_pid == -1 && cnid_metad_pid == -1)
+ if (in_shutdown && afpd_pid == -1 && cnid_metad_pid == -1 && dbus_pid == -1)
event_base_loopbreak(base);
}
+/* timer callback */
+static void timer_cb(evutil_socket_t fd, short what, void *arg)
+{
+ static int i = 0;
+
+ if (in_shutdown)
+ return;
+
+ if (afpd_pid == -1) {
+ afpd_restarts++;
+ LOG(log_note, logtype_afpd, "Restarting 'afpd' (restarts: %u)", afpd_restarts);
+ if ((afpd_pid = run_process(_PATH_AFPD, "-d", "-F", obj.options.configfile, NULL)) == -1) {
+ LOG(log_error, logtype_default, "Error starting 'afpd'");
+ }
+ }
+
+ if (cnid_metad_pid == -1) {
+ cnid_metad_restarts++;
+ LOG(log_note, logtype_afpd, "Restarting 'cnid_metad' (restarts: %u)", cnid_metad_restarts);
+ if ((cnid_metad_pid = run_process(_PATH_CNID_METAD, "-d", "-F", obj.options.configfile, NULL)) == -1) {
+ LOG(log_error, logtype_default, "Error starting 'cnid_metad'");
+ }
+ }
+
+ if (dbus_pid == -1) {
+ dbus_restarts++;
+ LOG(log_note, logtype_afpd, "Restarting 'dbus' (restarts: %u)", dbus_restarts);
+ if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus.session.conf", NULL)) == -1) {
+ LOG(log_error, logtype_default, "Error starting '%s'", dbus_path);
+ }
+ }
+}
+
/******************************************************************
* helper functions
******************************************************************/
-/* kill "count" processes passed as varargs of type "pid_t *" */
-static void kill_childs(int count, int sig, ...)
+/* kill processes passed as varargs of type "pid_t *", terminate list with NULL */
+static void kill_childs(int sig, ...)
{
va_list args;
pid_t *pid;
va_start(args, sig);
- while (count--) {
- pid = va_arg(args, pid_t *);
+ while ((pid = va_arg(args, pid_t *)) != NULL) {
if (*pid == -1)
continue;
kill(*pid, sig);
const char *configfile = NULL;
int c, ret, debug = 0;
sigset_t blocksigs;
+ struct timeval tv;
/* Log SIGBUS/SIGSEGV SBT */
fault_setup(NULL);
sigfillset(&blocksigs);
sigprocmask(SIG_SETMASK, &blocksigs, NULL);
- if (afp_config_parse(&obj) != 0)
+ if (afp_config_parse(&obj, "netatalk") != 0)
netatalk_exit(EXITERR_CONF);
- set_processname("netatalk");
- setuplog(obj.options.logconfig, obj.options.logfile);
event_set_log_callback(libevent_logmsg_cb);
event_set_fatal_callback(netatalk_exit);
netatalk_exit(EXITERR_CONF);
}
+ dbus_path = iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus path", "/bin/dbus-daemon");
+ LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path);
+ if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == -1) {
+ LOG(log_error, logtype_default, "Error starting '%s'", dbus_path);
+ netatalk_exit(EXITERR_CONF);
+ }
+
+ setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1);
+ system("tracker-control -s");
+
if ((base = event_base_new()) == NULL) {
LOG(log_error, logtype_afpd, "Error starting event loop");
netatalk_exit(EXITERR_CONF);
}
sigterm_ev = event_new(base, SIGTERM, EV_SIGNAL, sigterm_cb, NULL);
- sigquit_ev = event_new(base, SIGQUIT, EV_SIGNAL, sigquit_cb, NULL);
+ sigquit_ev = event_new(base, SIGQUIT, EV_SIGNAL | EV_PERSIST, sigquit_cb, NULL);
sigchld_ev = event_new(base, SIGCHLD, EV_SIGNAL | EV_PERSIST, sigchld_cb, NULL);
+ timer_ev = event_new(base, -1, EV_PERSIST, timer_cb, NULL);
+
+ tv.tv_sec = 1;
+ tv.tv_usec = 0;
event_add(sigterm_ev, NULL);
event_add(sigquit_ev, NULL);
event_add(sigchld_ev, NULL);
+ event_add(timer_ev, &tv);
sigfillset(&blocksigs);
sigdelset(&blocksigs, SIGTERM);
/* run the event loop */
ret = event_base_dispatch(base);
- /* got SIGTERM or similar, so we're going to shutdown */
-
- /* block any signal but SIGCHLD */
- sigfillset(&blocksigs);
- sigdelset(&blocksigs, SIGCHLD);
- sigprocmask(SIG_SETMASK, &blocksigs, NULL);
-
- /* setup new events: remove SIGTERM and SIGQUIT cbs, add timeout */
- struct timeval tv;
- tv.tv_sec = KILL_GRACETIME;
- tv.tv_usec = 0;
- event_base_loopexit(base, &tv);
- event_del(sigterm_ev);
- event_del(sigquit_ev);
-
- /* run the event loop again, waiting for child to exit on SIGTERM for KILL_GRACETIME seconds */
- kill_childs(2, SIGTERM, &afpd_pid, &cnid_metad_pid);
- ret = event_base_dispatch(base);
-
if (afpd_pid != -1 || cnid_metad_pid != -1) {
if (afpd_pid != -1)
LOG(log_error, logtype_afpd, "AFP service did not shutdown, killing it");
if (cnid_metad_pid != -1)
LOG(log_error, logtype_afpd, "CNID database service did not shutdown, killing it");
- kill_childs(2, SIGKILL, &afpd_pid, &cnid_metad_pid);
+ if (dbus_pid != -1)
+ LOG(log_error, logtype_afpd, "DBUS session daemon still running, killing it");
+ kill_childs(SIGKILL, &afpd_pid, &cnid_metad_pid, &dbus_pid, NULL);
}
+
+ LOG(log_note, logtype_afpd, "Netatalk AFP server exiting");
+
netatalk_exit(ret);
}