/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2006, 2007 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
*/
#include <config.h>
+#include "types.h"
#include <stdio.h>
#include <getopt.h>
#include <sys/time.h>
#include <pcre.h>
#include <fcntl.h>
+#include <gcrypt.h>
#include "daemonize.h"
#include "event.h"
#include "log.h"
#include "configuration.h"
+#include "rights.h"
#include "trackdb.h"
#include "queue.h"
#include "mem.h"
#include "user.h"
#include "mixer.h"
#include "eventlog.h"
+#include "printf.h"
static ev_source *ev;
{ "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 }
};
" --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);
+ xprintf("%s", disorder_version_string);
xfclose(stdout);
exit(0);
}
ev_timeout(ev, 0, &w, volumecheck_again, 0);
}
- 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 '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
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);
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 */
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);
+ /* start a rescan straight away if this is a new installation */
+ if(!trackdb_existing_database) {
+ trackdb_rescan(0/*ev*/);
+ /* No ev -> the rescan will block. Since we called reconfigure() already
+ * any clients will also be forced to block. */
+ }
rescan_after(86400);
/* periodically tidy up the database */
dbgc_after(60);
/* periodically check the volume */
- volumecheck_after(60);
+ volumecheck_again(0, 0, 0);
/* set initial state */
add_random_track();
play(ev);
Local Variables:
c-basic-offset:2
comment-column:40
+fill-column:79
End:
*/
~mdw / disorder / blobdiff