~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Play catchup with Apple dscl's API churn
[disorder]
/
server
/
state.c
diff --git
a/server/state.c
b/server/state.c
index
91bc078
..
3386cd4
100644
(file)
--- a/
server/state.c
+++ b/
server/state.c
@@
-36,6
+36,7
@@
#include "event.h"
#include "play.h"
#include "event.h"
#include "play.h"
+#include "rights.h"
#include "trackdb.h"
#include "state.h"
#include "configuration.h"
#include "trackdb.h"
#include "state.h"
#include "configuration.h"
@@
-53,11
+54,12
@@
static struct addrinfo *current_listen_addrinfo;
static int current_listen_fd;
void quit(ev_source *ev) {
static int current_listen_fd;
void quit(ev_source *ev) {
+ info("shutting down...");
quitting(ev);
trackdb_close();
trackdb_deinit();
quitting(ev);
trackdb_close();
trackdb_deinit();
- info("
termina
ting");
-
_
exit(0);
+ info("
exi
ting");
+ exit(0);
}
static void reset_socket(ev_source *ev) {
}
static void reset_socket(ev_source *ev) {
@@
-151,10
+153,12
@@
int reconfigure(ev_source *ev, int reload) {
speaker_reload();
info("%s: installed new configuration", configfile);
}
speaker_reload();
info("%s: installed new configuration", configfile);
}
- }
- trackdb_open(0);
+ trackdb_open(TRACKDB_NO_UPGRADE);
+ } else
+ /* We only allow for upgrade at startup */
+ trackdb_open(TRACKDB_CAN_UPGRADE);
if(need_another_rescan)
if(need_another_rescan)
- trackdb_rescan(ev);
+ trackdb_rescan(ev
, 1/*check*/
);
if(!ret) {
queue_read();
recent_read();
if(!ret) {
queue_read();
recent_read();