chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disorder-rescan can now suppress the check phase, which on first
[disorder]
/
server
/
state.c
diff --git
a/server/state.c
b/server/state.c
index 60fea267bb348ab6ce8a520fa1a831d460b13d92..16fc1a31482e8b00f1a92e4975707840372fb78a 100644
(file)
--- a/
server/state.c
+++ b/
server/state.c
@@
-36,11
+36,13
@@
#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 "log.h"
#include "queue.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"
#include "server.h"
#include "printf.h"
#include "addr.h"
@@
-56,7
+58,7
@@
void quit(ev_source *ev) {
trackdb_close();
trackdb_deinit();
info("terminating");
trackdb_close();
trackdb_deinit();
info("terminating");
-
_
exit(0);
+ exit(0);
}
static void reset_socket(ev_source *ev) {
}
static void reset_socket(ev_source *ev) {
@@
-143,17
+145,19
@@
int reconfigure(ev_source *ev, int reload) {
if(reload) {
need_another_rescan = trackdb_rescan_cancel();
trackdb_close();
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);
}
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)
if(need_another_rescan)
- trackdb_rescan(ev);
+ trackdb_rescan(ev
, 1/*check*/
);
if(!ret) {
queue_read();
recent_read();
if(!ret) {
queue_read();
recent_read();
@@
-168,4
+172,3
@@
c-basic-offset:2
comment-column:40
End:
*/
comment-column:40
End:
*/
-/* arch-tag:94e23a75c2ebdf8a11e17ed7b0fd8cb6 */