X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/02ba7921a8b083f421a747b89c65a87d0afd5841..784744a808c4620e2c1eec59fc3baf147fe8710e:/server/state.c?ds=sidebyside

diff --git a/server/state.c b/server/state.c
index 1c1e2aa..bd74b14 100644
--- a/server/state.c
+++ b/server/state.c
@@ -62,7 +62,7 @@ static struct sockaddr *copy_sockaddr(const struct addrinfo *addr) {
 }
 
 /** @brief Create and destroy sockets to set current configuration */
-static void reset_socket(ev_source *ev) {
+void reset_sockets(ev_source *ev) {
   const char *new_unix;
   struct addrinfo *res, *r;
   struct listener *l, **ll;
@@ -144,25 +144,24 @@ static void reset_socket(ev_source *ev) {
 }
 
 /** @brief Reconfigure the server
- * @param reload 0 at startup, 1 for a reload
+ * @param flags Flags
+ * @return As config_read(); 0 on success, -1 if could not (re-)read config
  */
-int reconfigure(ev_source *ev, int reload) {
+int reconfigure(ev_source *ev, unsigned flags) {
   int need_another_rescan = 0;
   int ret = 0;
 
-  D(("reconfigure(%d)", reload));
+  D(("reconfigure(%x)", flags));
   /* Deconfigure the old audio API if there is one */
   if(api) {
     if(api->close_mixer)
       api->close_mixer();
     api = NULL;
   }
-  if(reload) {
+  if(flags & RECONFIGURE_RELOADING) {
     /* If there's a rescan in progress, cancel it but remember to start a fresh
-     * one after the reload */
+     * one after the reload. */
     need_another_rescan = trackdb_rescan_cancel();
-    /* Close the track database */
-    trackdb_close();
     /* (Re-)read the configuration */
     if(config_read(1/*server*/, config))
       ret = -1;
@@ -171,12 +170,7 @@ int reconfigure(ev_source *ev, int reload) {
       speaker_reload();
       info("%s: installed new configuration", configfile);
     }
-    /* Re-open track database.  We don't attempt to support database version
-     * upgrade at this point - the software hasn't changed, after all. */
-    trackdb_open(TRACKDB_NO_UPGRADE);
-  } else
-    /* We only allow for upgrade at startup */
-    trackdb_open(TRACKDB_CAN_UPGRADE);
+  }
   /* New audio API */
   api = uaudio_find(config->api);
   if(api->configure)
@@ -186,35 +180,10 @@ int reconfigure(ev_source *ev, int reload) {
   /* If we interrupted a rescan of all the tracks, start a new one */
   if(need_another_rescan)
     trackdb_rescan(ev, 1/*check*/, 0, 0);
-  /* Arrange timeouts for schedule actions */
-  schedule_init(ev);
-  /* TODO what about leftover callbacks from before the reload? */
-  if(!ret) {
-    /* Read the queue back in */
-    queue_read();
-    recent_read();
-    /* Reset sockets */
-    reset_socket(ev);
+  if(!ret && !(flags & RECONFIGURE_FIRST)) {
+    /* Open/close sockets */
+    reset_sockets(ev);
   }
-  /* TODO we need a careful think about what you can and cannot change with a
-   * reload.
-   *
-   * For instance saving and restoring the queue limits what we can usefuly
-   * keep in the queue data structure.  As a general rule, long-term state
-   * ought to be off-limits.  So 'home directory' will have to stay where it
-   * is.  (This actually means the AF_UNIX socket will never be re-opened.)
-   *
-   * Players certainly ought to be reconfigurable but this raises the ugly
-   * question of what to do about already-started background decoders.
-   *
-   * The audio API is easy to do for the server but a pain for the speaker.
-   *
-   * These two points suggest a general approach: if things that affect the
-   * speaker change, we could just restart it and any extant background
-   * decoders, at the next track change.  This would generate a bit of a gap
-   * but presumably reconfiguration is a rare event so this might be
-   * acceptable.
-   */
   return ret;
 }