#include "event.h"
#include "play.h"
+#include "rights.h"
#include "trackdb.h"
#include "state.h"
#include "configuration.h"
#include "log.h"
#include "queue.h"
+#include "server-queue.h"
#include "server.h"
#include "printf.h"
#include "addr.h"
static int current_listen_fd;
void quit(ev_source *ev) {
+ info("shutting down...");
quitting(ev);
trackdb_close();
trackdb_deinit();
- info("terminating");
- _exit(0);
+ info("exiting");
+ exit(0);
}
static void reset_socket(ev_source *ev) {
if(reload) {
need_another_rescan = trackdb_rescan_cancel();
trackdb_close();
- if(config_read())
+ if(config_read(1))
ret = -1;
else {
/* Tell the speaker it needs to reload its config too. */
speaker_reload();
info("%s: installed new configuration", configfile);
}
- }
- trackdb_open();
+ trackdb_open(TRACKDB_NO_UPGRADE);
+ } else
+ /* We only allow for upgrade at startup */
+ trackdb_open(TRACKDB_CAN_UPGRADE);
if(need_another_rescan)
- trackdb_rescan(ev);
+ trackdb_rescan(ev, 1/*check*/);
if(!ret) {
queue_read();
recent_read();