/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2008 Richard Kettlewell
+ * Copyright (C) 2004-2009 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 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.
- *
+ * 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.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-#include <config.h>
-#include "types.h"
-
-#include <stdio.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/socket.h>
-#include <time.h>
-#include <locale.h>
-#include <syslog.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 "play.h"
-#include "server.h"
-#include "state.h"
-#include "syscalls.h"
-#include "defs.h"
-#include "user.h"
-#include "mixer.h"
-#include "eventlog.h"
-#include "printf.h"
-#include "version.h"
+/** @file server/disorderd.c
+ * @brief Main DisOrder server
+ */
+#include "disorder-server.h"
static ev_source *ev;
int attribute((unused)) sig,
void attribute((unused)) *u) {
info("received SIGHUP");
- reconfigure(ev, 1);
+ reconfigure(ev, RECONFIGURE_RELOADING);
return 0;
}
}
/** @brief Create a periodic action
- * @param ev Event loop
+ * @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 periodic_rescan(ev_source *ev_) {
- trackdb_rescan(ev_, 1/*check*/);
+ trackdb_rescan(ev_, 1/*check*/, 0, 0);
}
static void periodic_database_gc(ev_source attribute((unused)) *ev_) {
int l, r;
char lb[32], rb[32];
- if(!mixer_control(&l, &r, 0)) {
+ if(api && api->get_volume) {
+ api->get_volume(&l, &r);
if(l != volume_left || r != volume_right) {
volume_left = l;
volume_right = r;
int main(int argc, char **argv) {
int n, background = 1, logsyslog = 0;
const char *pidfile = 0;
+ struct rlimit rl[1];
set_progname(argv);
mem_init();
}
info("process ID %lu", (unsigned long)getpid());
fix_path();
- srand(time(0)); /* don't start the same every time */
+ srand(xtime(0)); /* don't start the same every time */
/* gcrypt initialization */
+ if(!gcry_check_version(NULL))
+ disorder_fatal(0, "gcry_check_version failed");
gcry_control(GCRYCTL_INIT_SECMEM, 1);
+ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+ /* make sure we can't have more than FD_SETSIZE files open (event.c does
+ * check but this provides an additional line of defence) */
+ if(getrlimit(RLIMIT_NOFILE, rl) < 0)
+ fatal(errno, "getrlimit RLIMIT_NOFILE");
+ if(rl->rlim_cur > FD_SETSIZE) {
+ rl->rlim_cur = FD_SETSIZE;
+ if(setrlimit(RLIMIT_NOFILE, rl) < 0)
+ fatal(errno, "setrlimit to reduce RLIMIT_NOFILE to %lu",
+ (unsigned long)rl->rlim_cur);
+ info("set RLIM_NOFILE to %lu", (unsigned long)rl->rlim_cur);
+ } else
+ info("RLIM_NOFILE is %lu", (unsigned long)rl->rlim_cur);
/* create event loop */
ev = ev_new();
if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
/* read config */
- if(config_read(1))
+ config_uaudio_apis = uaudio_apis;
+ if(config_read(1, NULL))
fatal(0, "cannot read configuration");
/* make sure the home directory exists and has suitable permissions */
make_home();
/* make sure we're not root, whatever the config says */
if(getuid() == 0 || geteuid() == 0) fatal(0, "do not run as root");
/* open a lockfile - we only want one copy of the server to run at once. */
- if(config->lock) {
+ if(1) {
const char *lockfile;
int lockfd;
struct flock lock;
/* initialize database environment */
trackdb_init(TRACKDB_NORMAL_RECOVER|TRACKDB_MAY_CREATE);
trackdb_master(ev);
- /* install new config (calls trackdb_open()) */
- reconfigure(ev, 0);
+ /* install new config; don't create socket */
+ if(reconfigure(ev, RECONFIGURE_FIRST))
+ fatal(0, "failed to read configuration");
+ /* Open the database */
+ trackdb_open(TRACKDB_CAN_UPGRADE);
+ /* load the queue and recently-played list */
+ queue_read();
+ recent_read();
+ /* Arrange timeouts for schedule actions */
+ schedule_init(ev);
/* pull in old users */
trackdb_old_users();
/* create a root login */
trackdb_create_root();
+ /* create sockets */
+ reset_sockets(ev);
+ /* check for change to database parameters */
+ dbparams_check();
/* 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 */
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 ten seconds */
- create_periodic(ev, periodic_add_random, 10, 1);
+ /* 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 */
~mdw / disorder / blobdiff