X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/763d5e6ad88ef3ba1cd1d7742d060e4f1e54c6b8..d0b6635eee6d656502d129e88c65a5014c8e042f:/server/disorderd.c diff --git a/server/disorderd.c b/server/disorderd.c index 50f8b8f..3a5e093 100644 --- a/server/disorderd.c +++ b/server/disorderd.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * 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 @@ -19,6 +19,7 @@ */ #include +#include "types.h" #include #include @@ -37,11 +38,13 @@ #include #include #include +#include #include "daemonize.h" #include "event.h" #include "log.h" #include "configuration.h" +#include "rights.h" #include "trackdb.h" #include "queue.h" #include "mem.h" @@ -53,13 +56,11 @@ #include "user.h" #include "mixer.h" #include "eventlog.h" +#include "printf.h" +#include "version.h" static ev_source *ev; -static void rescan_after(long offset); -static void dbgc_after(long offset); -static void volumecheck_after(long offset); - static const struct option options[] = { { "help", no_argument, 0, 'h' }, { "version", no_argument, 0, 'V' }, @@ -68,7 +69,8 @@ static const struct option options[] = { { "foreground", no_argument, 0, 'f' }, { "log", required_argument, 0, 'l' }, { "pidfile", required_argument, 0, 'P' }, - { "no-initial-rescan", no_argument, 0, 'N' }, + { "wide-open", no_argument, 0, 'w' }, + { "syslog", no_argument, 0, 's' }, { 0, 0, 0, 0 } }; @@ -82,17 +84,13 @@ static void help(void) { " --config PATH, -c PATH Set configuration file\n" " --debug, -d Turn on debugging\n" " --foreground, -f Do not become a daemon\n" + " --syslog, -s Log to syslog even with -f\n" " --pidfile PATH, -P PATH Leave a pidfile\n"); xfclose(stdout); exit(0); } -/* display version number and terminate */ -static void version(void) { - xprintf("disorderd version %s\n", disorder_version_string); - xfclose(stdout); - exit(0); -} +/* signals ------------------------------------------------------------------ */ /* SIGHUP callback */ static int handle_sighup(ev_source attribute((unused)) *ev_, @@ -119,45 +117,61 @@ static int handle_sigterm(ev_source attribute((unused)) *ev_, quit(ev); } -static int rescan_again(ev_source *ev_, - const struct timeval attribute((unused)) *now, - void attribute((unused)) *u) { - trackdb_rescan(ev_); - rescan_after(86400); - return 0; -} +/* periodic actions --------------------------------------------------------- */ + +struct periodic_data { + void (*callback)(ev_source *); + int period; +}; -static void rescan_after(long offset) { +static int periodic_callback(ev_source *ev_, + const struct timeval attribute((unused)) *now, + void *u) { struct timeval w; + struct periodic_data *const pd = u; + pd->callback(ev_); gettimeofday(&w, 0); - w.tv_sec += offset; - ev_timeout(ev, 0, &w, rescan_again, 0); -} - -static int dbgc_again(ev_source attribute((unused)) *ev_, - const struct timeval attribute((unused)) *now, - void attribute((unused)) *u) { - trackdb_gc(); - dbgc_after(60); + w.tv_sec += pd->period; + ev_timeout(ev, 0, &w, periodic_callback, pd); return 0; } -static void dbgc_after(long offset) { +/** @brief Create a periodic action + * @param ev Event loop + * @param callback Callback function + * @param period Interval between calls in seconds + * @param immediate If true, call @p callback straight away + */ +static void create_periodic(ev_source *ev_, + void (*callback)(ev_source *), + int period, + int immediate) { struct timeval w; + struct periodic_data *const pd = xmalloc(sizeof *pd); + pd->callback = callback; + pd->period = period; + if(immediate) + callback(ev_); gettimeofday(&w, 0); - w.tv_sec += offset; - ev_timeout(ev, 0, &w, dbgc_again, 0); + w.tv_sec += period; + ev_timeout(ev_, 0, &w, periodic_callback, pd); } -static int volumecheck_again(ev_source attribute((unused)) *ev_, - const struct timeval attribute((unused)) *now, - void attribute((unused)) *u) { +static void periodic_rescan(ev_source *ev_) { + trackdb_rescan(ev_, 1/*check*/); +} + +static void periodic_database_gc(ev_source attribute((unused)) *ev_) { + trackdb_gc(); +} + +static void periodic_volume_check(ev_source attribute((unused)) *ev_) { int l, r; char lb[32], rb[32]; - if(!mixer_control(&l, &r, 0)) { + if(!mixer_control(-1/*as configured*/, &l, &r, 0)) { if(l != volume_left || r != volume_right) { volume_left = l; volume_right = r; @@ -166,52 +180,81 @@ static int volumecheck_again(ev_source attribute((unused)) *ev_, eventlog("volume", lb, rb, (char *)0); } } - volumecheck_after(60); - return 0; } -static void volumecheck_after(long offset) { - struct timeval w; +static void periodic_play_check(ev_source *ev_) { + play(ev_); +} - gettimeofday(&w, 0); - w.tv_sec += offset; - ev_timeout(ev, 0, &w, volumecheck_again, 0); +static void periodic_add_random(ev_source *ev_) { + add_random_track(ev_); } - int main(int argc, char **argv) { - int n, background = 1; +/* We fix the path to include the bindir and sbindir we were installed into */ +static void fix_path(void) { + char *path = getenv("PATH"); + static char *newpath; + /* static or libgc collects it! */ + + if(!path) + error(0, "PATH is not set at all!"); + + if(*finkbindir && strcmp(finkbindir, "/")) + /* We appear to be a finkized mac; include fink on the path in case the + * tools we need are there. */ + byte_xasprintf(&newpath, "PATH=%s:%s:%s:%s", + path, bindir, sbindir, finkbindir); + else + byte_xasprintf(&newpath, "PATH=%s:%s:%s", path, bindir, sbindir); + putenv(newpath); + info("%s", newpath); +} + +int main(int argc, char **argv) { + int n, background = 1, logsyslog = 0; const char *pidfile = 0; - int initial_rescan = 1; set_progname(argv); - mem_init(1); + mem_init(); if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); /* garbage-collect PCRE's memory */ pcre_malloc = xmalloc; pcre_free = xfree; - while((n = getopt_long(argc, argv, "hVc:dfP:N", options, 0)) >= 0) { + while((n = getopt_long(argc, argv, "hVc:dfP:Ns", options, 0)) >= 0) { switch(n) { case 'h': help(); - case 'V': version(); + case 'V': version("disorderd"); case 'c': configfile = optarg; break; case 'd': debugging = 1; break; case 'f': background = 0; break; case 'P': pidfile = optarg; break; - case 'N': initial_rescan = 0; break; + case 's': logsyslog = 1; break; + case 'w': wideopen = 1; break; default: fatal(0, "invalid option"); } } /* go into background if necessary */ if(background) daemonize(progname, LOG_DAEMON, pidfile); + else if(logsyslog) { + /* If we're running under some kind of daemon supervisor then we may want + * to log to syslog but not to go into background */ + openlog(progname, LOG_PID, LOG_DAEMON); + log_default = &log_syslog; + } info("process ID %lu", (unsigned long)getpid()); + fix_path(); srand(time(0)); /* don't start the same every time */ + /* gcrypt initialization */ + gcry_control(GCRYCTL_INIT_SECMEM, 1); /* create event loop */ ev = ev_new(); if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed"); /* read config */ - if(config_read()) + if(config_read(1)) fatal(0, "cannot read configuration"); + /* make sure the home directory exists and has suitable permissions */ + make_home(); /* Start the speaker process (as root! - so it can choose its nice value) */ speaker_setup(ev); /* set server nice value _after_ starting the speaker, so that they @@ -225,8 +268,8 @@ static void volumecheck_after(long offset) { if(config->lock) { const char *lockfile; int lockfd; - struct flock lock; - + struct flock lock; + lockfile = config_get_file("lock"); if((lockfd = open(lockfile, O_RDWR|O_CREAT, 0600)) < 0) fatal(errno, "error opening %s", lockfile); @@ -238,10 +281,14 @@ static void volumecheck_after(long offset) { fatal(errno, "error locking %s", lockfile); } /* initialize database environment */ - trackdb_init(TRACKDB_NORMAL_RECOVER); + trackdb_init(TRACKDB_NORMAL_RECOVER|TRACKDB_MAY_CREATE); trackdb_master(ev); - /* install new config */ + /* install new config (calls trackdb_open()) */ reconfigure(ev, 0); + /* pull in old users */ + trackdb_old_users(); + /* create a root login */ + trackdb_create_root(); /* re-read config if we receive a SIGHUP */ if(ev_signal(ev, SIGHUP, handle_sighup, 0)) fatal(0, "ev_signal failed"); /* exit on SIGINT/SIGTERM */ @@ -249,17 +296,16 @@ static void volumecheck_after(long offset) { if(ev_signal(ev, SIGTERM, handle_sigterm, 0)) fatal(0, "ev_signal failed"); /* ignore SIGPIPE */ signal(SIGPIPE, SIG_IGN); - /* start a rescan straight away */ - if(initial_rescan) - trackdb_rescan(ev); - rescan_after(86400); - /* periodically tidy up the database */ - dbgc_after(60); - /* periodically check the volume */ - volumecheck_after(60); - /* set initial state */ - add_random_track(); - play(ev); + /* Rescan immediately and then daily */ + create_periodic(ev, periodic_rescan, 86400, 1/*immediate*/); + /* Tidy up the database once a minute */ + create_periodic(ev, periodic_database_gc, 60, 0); + /* Check the volume immediately and then once a minute */ + create_periodic(ev, periodic_volume_check, 60, 1); + /* Check for a playable track once a second */ + create_periodic(ev, periodic_play_check, 1, 0); + /* Try adding a random track immediately and once every two seconds */ + create_periodic(ev, periodic_add_random, 2, 1); /* enter the event loop */ n = ev_run(ev); /* if we exit the event loop, something must have gone wrong */ @@ -270,5 +316,6 @@ static void volumecheck_after(long offset) { Local Variables: c-basic-offset:2 comment-column:40 +fill-column:79 End: */