split out dcgi_get_cookie

[disorder] / server / state.c

diff --git a/server/state.c b/server/state.c
index 455cf41f09403e73cf92da3d778538843b7e4a0f..3adcf2b88fcf51ef1d651d5d0c00e0e7e8e5979e 100644 (file)
--- a/server/state.c
+++ b/server/state.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 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
@@ -36,11 +36,13 @@
 
 #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"
@@ -52,11 +54,12 @@ static struct addrinfo *current_listen_addrinfo;
 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) {
@@ -66,14 +69,10 @@ static void reset_socket(ev_source *ev) {
   char *name;
   
   static const struct addrinfo pref = {
-    AI_PASSIVE,
-    PF_INET,
-    SOCK_STREAM,
-    IPPROTO_TCP,
-    0,
-    0,
-    0,
-    0
+    .ai_flags = AI_PASSIVE,
+    .ai_family = PF_INET,
+    .ai_socktype = SOCK_STREAM,
+    .ai_protocol = IPPROTO_TCP,
   };
 
   /* unix first */
@@ -143,17 +142,19 @@ int reconfigure(ev_source *ev, int reload) {
   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();