X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fnetatalk%2Fnetatalk.c;h=9aaa3a742603eede7b5b68a2e34fa7f6e509b79d;hb=b5ba94c620d6e7e5c78af6d8f29ed5890323eb18;hp=3d052f46d3897100895ec85c301a47d339125790;hpb=63b62dd0dffba9b8b4b519af2f78d0224c6d7a90;p=netatalk.git diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c index 3d052f46..9aaa3a74 100644 --- a/etc/netatalk/netatalk.c +++ b/etc/netatalk/netatalk.c @@ -1,8 +1,16 @@ -/* - * Copyright (c) 1990,1993 Regents of The University of Michigan. - * All Rights Reserved. See COPYRIGHT. - */ - +/* + Copyright (c) 2012 Frank Lahm + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +*/ #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ @@ -32,6 +40,8 @@ #include #include #include +#include +#include #include @@ -44,12 +54,56 @@ 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, trackerd_pid = -1; +static uint afpd_restarts, cnid_metad_restarts, dbus_restarts, trackerd_restarts; static struct event_base *base; struct event *sigterm_ev, *sigquit_ev, *sigchld_ev, *timer_ev; static int in_shutdown; +static const char *dbus_path; +static char *trackerd_loglev; + +/****************************************************************** + * Misc stuff + ******************************************************************/ + +/* Set Tracker Miners to index all our volumes */ +static int set_sl_volumes(void) +{ + EC_INIT; + const struct vol *volumes, *vol; + struct bstrList *vollist = bstrListCreate(); + bstring sep = bfromcstr(", "); + bstring volnamelist = NULL, cmd = NULL; + + EC_NULL_LOG( volumes = getvolumes() ); + + for (vol = volumes; vol; vol = vol->v_next) { + if (vol->v_flags & AFPVOL_SPOTLIGHT) { + bstring volnamequot = bformat("'%s'", vol->v_path); + bstrListPush(vollist, volnamequot); + } + } + + volnamelist = bjoin(vollist, sep); + cmd = bformat("gsettings set org.freedesktop.Tracker.Miner.Files index-recursive-directories \"[%s]\"", + bdata(volnamelist) ? bdata(volnamelist) : ""); + LOG(log_debug, logtype_sl, "set_sl_volumes: %s", bdata(cmd)); + system(bdata(cmd)); + + /* Disable default root user home indexing */ + system("gsettings set org.freedesktop.Tracker.Miner.Files index-single-directories \"[]\""); + +EC_CLEANUP: + if (cmd) + bdestroy(cmd); + if (sep) + bdestroy(sep); + if (vollist) + bstrListDestroy(vollist); + if (volnamelist) + bdestroy(volnamelist); + EC_EXIT; +} /****************************************************************** * libevent helper functions @@ -106,55 +160,67 @@ static void sigterm_cb(evutil_socket_t fd, short what, void *arg) event_del(sigquit_ev); event_del(timer_ev); - kill_childs(SIGTERM, &afpd_pid, &cnid_metad_pid, NULL); +#ifdef HAVE_TRACKER_SPARQL + system("tracker-control -t"); +#endif + kill_childs(SIGTERM, &afpd_pid, &cnid_metad_pid, &dbus_pid, &trackerd_pid, NULL); } /* SIGQUIT callback */ static void sigquit_cb(evutil_socket_t fd, short what, void *arg) { LOG(log_note, logtype_afpd, "Exiting on SIGQUIT"); - kill_childs(SIGQUIT, &afpd_pid, &cnid_metad_pid, NULL); +#ifdef HAVE_TRACKER_SPARQL + system("tracker-control -t"); +#endif + kill_childs(SIGQUIT, &afpd_pid, &cnid_metad_pid, &dbus_pid, &trackerd_pid, NULL); +} + +/* SIGHUP callback */ +static void sighup_cb(evutil_socket_t fd, short what, void *arg) +{ + LOG(log_note, logtype_afpd, "Received SIGHUP, sending all processes signal to reload config"); + kill_childs(SIGHUP, &afpd_pid, &cnid_metad_pid, &trackerd_pid, NULL); } /* SIGCHLD callback */ static void sigchld_cb(evutil_socket_t fd, short what, void *arg) { - int status, i; + int status; 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) afpd_pid = -1; - else if (pid = cnid_metad_pid) + else if (pid == cnid_metad_pid) cnid_metad_pid = -1; + else if (pid == dbus_pid) + dbus_pid = -1; + else if (pid == trackerd_pid) + trackerd_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 && trackerd_pid == -1) event_base_loopbreak(base); } /* timer callback */ static void timer_cb(evutil_socket_t fd, short what, void *arg) { - static int i = 0; - LOG(log_debug, logtype_afpd, "looping: %i", i++); - if (in_shutdown) return; @@ -162,7 +228,7 @@ static void timer_cb(evutil_socket_t fd, short what, void *arg) 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'"); + LOG(log_error, logtype_default, "Error starting 'afpd'"); } } @@ -170,9 +236,29 @@ static void timer_cb(evutil_socket_t fd, short what, void *arg) 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'"); + LOG(log_error, logtype_default, "Error starting 'cnid_metad'"); } } + +#ifdef HAVE_TRACKER + 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); + } + } +#endif + +#ifdef HAVE_TRACKER_RDF + if (trackerd_pid == -1) { + trackerd_restarts++; + LOG(log_note, logtype_afpd, "Restarting 'trackerd' (restarts: %u)", trackerd_restarts); + if ((trackerd_pid = run_process(TRACKERD_PATH, trackerd_loglev, NULL)) == -1) { + LOG(log_error, logtype_default, "Error starting '%s'", "/usr/bin/trackerd"); + } + } +#endif } /****************************************************************** @@ -198,7 +284,7 @@ static void kill_childs(int sig, ...) /* this get called when error conditions are met that require us to exit gracefully */ static void netatalk_exit(int ret) { - server_unlock(_PATH_NETATALK_LOCK); + server_unlock(PATH_NETATALK_LOCK); exit(ret); } @@ -206,7 +292,8 @@ static void netatalk_exit(int ret) static pid_t run_process(const char *path, ...) { int ret, i = 0; - char *myargv[10]; +#define MYARVSIZE 64 + char *myargv[MYARVSIZE]; va_list args; pid_t pid; @@ -218,8 +305,10 @@ static pid_t run_process(const char *path, ...) if (pid == 0) { myargv[i++] = (char *)path; va_start(args, path); - while ((myargv[i++] = va_arg(args, char *)) != NULL) - ; + while (i < MYARVSIZE) { + if ((myargv[i++] = va_arg(args, char *)) == NULL) + break; + } va_end(args); ret = execv(path, myargv); @@ -238,7 +327,6 @@ static void usage(void) int main(int argc, char **argv) { - const char *configfile = NULL; int c, ret, debug = 0; sigset_t blocksigs; struct timeval tv; @@ -260,30 +348,30 @@ int main(int argc, char **argv) } } - if (check_lockfile("netatalk", _PATH_NETATALK_LOCK) != 0) + if (check_lockfile("netatalk", PATH_NETATALK_LOCK) != 0) exit(EXITERR_SYS); if (!debug && daemonize(0, 0) != 0) exit(EXITERR_SYS); - if (create_lockfile("netatalk", _PATH_NETATALK_LOCK) != 0) + if (create_lockfile("netatalk", PATH_NETATALK_LOCK) != 0) exit(EXITERR_SYS); 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); + load_volumes(&obj); + event_set_log_callback(libevent_logmsg_cb); event_set_fatal_callback(netatalk_exit); LOG(log_note, logtype_default, "Netatalk AFP server starting"); if ((afpd_pid = run_process(_PATH_AFPD, "-d", "-F", obj.options.configfile, NULL)) == -1) { - LOG(log_error, logtype_afpd, "Error starting 'cnid_metad'"); + LOG(log_error, logtype_afpd, "Error starting 'afpd'"); netatalk_exit(EXITERR_CONF); } @@ -299,6 +387,7 @@ int main(int argc, char **argv) sigterm_ev = event_new(base, SIGTERM, EV_SIGNAL, sigterm_cb, NULL); sigquit_ev = event_new(base, SIGQUIT, EV_SIGNAL | EV_PERSIST, sigquit_cb, NULL); + sigquit_ev = event_new(base, SIGHUP, EV_SIGNAL | EV_PERSIST, sighup_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); @@ -314,17 +403,55 @@ int main(int argc, char **argv) sigdelset(&blocksigs, SIGTERM); sigdelset(&blocksigs, SIGQUIT); sigdelset(&blocksigs, SIGCHLD); + sigdelset(&blocksigs, SIGHUP); sigprocmask(SIG_SETMASK, &blocksigs, NULL); +#ifdef HAVE_TRACKER + setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1); + setenv("XDG_DATA_HOME", _PATH_STATEDIR, 0); + setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0); + + dbus_path = iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH); + 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); + } + + /* Allow dbus some time to start up */ + sleep(1); +#endif + +#ifdef HAVE_TRACKER_SPARQL +#ifdef SOLARIS + setenv("XDG_DATA_DIRS", TRACKER_PREFIX "/share", 0); + setenv("TRACKER_DB_ONTOLOGIES_DIR", TRACKER_PREFIX "/share/tracker/ontologies", 0); + setenv("TRACKER_EXTRACTOR_RULES_DIR", TRACKER_PREFIX "/share/tracker/extract-rules", 0); + setenv("TRACKER_LANGUAGE_STOPWORDS_DIR", TRACKER_PREFIX "/share/tracker/languages", 0); +#endif + set_sl_volumes(); + system(TRACKER_PREFIX "/bin/tracker-control -s"); +#endif +#ifdef HAVE_TRACKER_RDF + if ((trackerd_pid = run_process(TRACKERD_PATH, trackerd_loglev, NULL)) == -1) { + LOG(log_error, logtype_default, "Error starting '%s'", TRACKERD_PATH); + netatalk_exit(EXITERR_CONF); + } +#endif + /* run the event loop */ ret = event_base_dispatch(base); - if (afpd_pid != -1 || cnid_metad_pid != -1) { + if (afpd_pid != -1 || cnid_metad_pid != -1 || dbus_pid != -1 || trackerd_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(SIGKILL, &afpd_pid, &cnid_metad_pid, NULL); + if (dbus_pid != -1) + LOG(log_error, logtype_afpd, "DBUS session daemon still running, killing it"); + if (trackerd_pid != -1) + LOG(log_error, logtype_afpd, "trackerd still running, killing it"); + kill_childs(SIGKILL, &afpd_pid, &cnid_metad_pid, &dbus_pid, &trackerd_pid, NULL); } LOG(log_note, logtype_afpd, "Netatalk AFP server exiting");