Do some basic compatibility checking when installing a new server

configuration.  There is plenty more that could be done.

diff --git a/README.reload b/README.reload
index 66d74a8e996cf51a9ee32eebc504eb155a70242c..6c645ec81188411f028f310ea1c87907dfb113f2 100644 (file)
--- a/README.reload
+++ b/README.reload
@@ -5,14 +5,15 @@ This is current rather vaguely defined and implemented.  This file
 will lay out what you can and cannot change over a reconfigure.  Any
 other changes will require a full server restart.
 
 will lay out what you can and cannot change over a reconfigure.  Any
 other changes will require a full server restart.
 

-I intend to improve the situation, but for now this is how it is.
+The situation is gradually improving; this file tracks the current
+state.

 
 * Options that might have to remain the same across restart
 
 Arguably if there is anything in this section then that's a serious
 bug!
 
 
 * Options that might have to remain the same across restart
 
 Arguably if there is anything in this section then that's a serious
 bug!
 

-** alias
+** alias (enforced at reload only)

 
 This defines how aliases are inserted into the track database.  Need
 to think about how changing it will affect things.
 
 This defines how aliases are inserted into the track database.  Need
 to think about how changing it will affect things.


@@ -26,7 +27,7 @@ Probably affects alias construction.
 The search database will have to be rebuilt from scratch.  This is
 do-able but AFAIK we don't detect it.
 
 The search database will have to be rebuilt from scratch.  This is
 do-able but AFAIK we don't detect it.
 

-** user
+** user (enforced at reload only)

 
 All the files will be owned by the wrong user!
 
 
 All the files will be owned by the wrong user!
 


@@ -36,20 +37,18 @@ Some things will just require a restart.  We should either enforce
 this (refusing to accept modified configurations that purport to
 change them) or explicitly ignore it.
 
 this (refusing to accept modified configurations that purport to
 change them) or explicitly ignore it.
 

-** home
+** home (enforced at reload)

 
 

-We absolutely cannot accept changing our state directory.  If this is
-attempted it must be rejected.
+We absolutely cannot accept changing our state directory.

 
 

-** lock
+** lock (generates a deprecation warning)

 
 Liable to be removed anyway.
 
 
 Liable to be removed anyway.
 

-** nice_speaker
+** nice_speaker (generates a warning)

 
 

-Can't renice a running speaker to make it less nice (and we don't try
-to make it more nice).  We ought to issue an error message and
-otherwise ignore.
+You can't renice a running speaker to make it less nice (and we don't
+try to make it more nice).

 
 * Options that ought to be changable across reload but aren't
 
 
 * Options that ought to be changable across reload but aren't
 

diff --git a/cgi/cgimain.c b/cgi/cgimain.c
index 583af30e01a7e42f939259044f0edf691d11dfcd..e4c722033a9640273eedb7b3c7509d4682e784f8 100644 (file)
--- a/cgi/cgimain.c
+++ b/cgi/cgimain.c
@@ -48,7 +48,7 @@ int main(int argc, char **argv) {
   if(getenv("DISORDER_DEBUG"))
     debugging = 1;
   /* Read configuration */
   if(getenv("DISORDER_DEBUG"))
     debugging = 1;
   /* Read configuration */

-  if(config_read(0/*!server*/))
+  if(config_read(0/*!server*/, NULL))

     exit(EXIT_FAILURE);
   /* Figure out our URL.  This can still be overridden from the config file if
    * necessary but it shouldn't be necessary in ordinary installations. */
     exit(EXIT_FAILURE);
   /* Figure out our URL.  This can still be overridden from the config file if
    * necessary but it shouldn't be necessary in ordinary installations. */

diff --git a/clients/disorder.c b/clients/disorder.c
index 24663111ae745942148ea3c64d3035ad6ee524eb..bc2a8ec1a30c4a02e3ceea8135e7ea9ba15707ce 100644 (file)
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -158,7 +158,7 @@ static void cf_shutdown(char attribute((unused)) **argv) {
 
 static void cf_reconfigure(char attribute((unused)) **argv) {
   /* Re-check configuration for server */
 
 static void cf_reconfigure(char attribute((unused)) **argv) {
   /* Re-check configuration for server */

-  if(config_read(1)) fatal(0, "cannot read configuration");
+  if(config_read(1, NULL)) fatal(0, "cannot read configuration");

   if(disorder_reconfigure(getclient())) exit(EXIT_FAILURE);
 }
 
   if(disorder_reconfigure(getclient())) exit(EXIT_FAILURE);
 }
 


@@ -754,7 +754,7 @@ int main(int argc, char **argv) {
     default: fatal(0, "invalid option");
     }
   }
     default: fatal(0, "invalid option");
     }
   }

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   if(user) {
     config->username = user;
     config->password = 0;
   if(user) {
     config->username = user;
     config->password = 0;

diff --git a/clients/playrtp.c b/clients/playrtp.c
index f5f538de4a6540d6fbba3ae29eb890cf8428a2a5..81c1e8eb15115697ba5ce114b70808d0b2d5a972 100644 (file)
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -621,7 +621,7 @@ int main(int argc, char **argv) {
     default: fatal(0, "invalid option");
     }
   }
     default: fatal(0, "invalid option");
     }
   }

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   if(!maxbuffer)
     maxbuffer = 2 * minbuffer;
   argc -= optind;
   if(!maxbuffer)
     maxbuffer = 2 * minbuffer;
   argc -= optind;

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index dea9d59276b0bc65a587a2f7120ef59bd66a4a37..a4e9d20773f0d1e4ce4649a7713fd9a06d41e54c 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -460,7 +460,7 @@ int main(int argc, char **argv) {
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   /* we'll need mixer support */
   backend = uaudio_apis[0];
   if(backend->open_mixer)
   /* we'll need mixer support */
   backend = uaudio_apis[0];
   if(backend->open_mixer)

diff --git a/lib/configuration.c b/lib/configuration.c
index 1fcfb1a6eefd138ef66aaba05dfa47438632c8da..dd089491ce423b9b31eacfb4d997de14e760c515 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -1156,7 +1156,7 @@ static struct config *config_default(void) {
   logname = pw->pw_name;
   c->username = xstrdup(logname);
   c->refresh = 15;
   logname = pw->pw_name;
   c->username = xstrdup(logname);
   c->refresh = 15;

-  c->prefsync = 3600;
+  c->prefsync = 0;

   c->signal = SIGKILL;
   c->alias = xstrdup("{/artist}{/album}{/title}{ext}");
   c->lock = 1;
   c->signal = SIGKILL;
   c->alias = xstrdup("{/artist}{/album}{/title}{ext}");
   c->lock = 1;


@@ -1326,8 +1326,14 @@ static void config_postdefaults(struct config *c,
 
 /** @brief (Re-)read the config file
  * @param server If set, do extra checking
 
 /** @brief (Re-)read the config file
  * @param server If set, do extra checking

+ * @param oldconfig Old configuration for compatibility check
+ * @return 0 on success, non-0 on error
+ *
+ * If @p oldconfig is set, then certain compatibility checks are done between
+ * the old and new configurations.

  */
  */

-int config_read(int server) {
+int config_read(int server,
+                const struct config *oldconfig) {

   struct config *c;
   char *privconf;
   struct passwd *pw;
   struct config *c;
   char *privconf;
   struct passwd *pw;


@@ -1362,6 +1368,31 @@ int config_read(int server) {
   }
   /* install default namepart and transform settings */
   config_postdefaults(c, server);
   }
   /* install default namepart and transform settings */
   config_postdefaults(c, server);

+  if(oldconfig)  {
+    int failed = 0;
+    if(strcmp(c->home, oldconfig->home)) {
+      error(0, "'home' cannot be changed without a restart");
+      failed = 1;
+    }
+    if(strcmp(c->alias, oldconfig->alias)) {
+      error(0, "'alias' cannot be changed without a restart");
+      failed = 1;
+    }
+    if(strcmp(c->user, oldconfig->user)) {
+      error(0, "'user' cannot be changed without a restart");
+      failed = 1;
+    }
+    if(c->nice_speaker != oldconfig->nice_speaker) {
+      error(0, "'nice_speaker' cannot be changed without a restart");
+      /* ...but we accept the new config anyway */
+    }
+    /* TODO namepart */
+    /* TODO stopword */
+    if(failed) {
+      error(0, "not installing incompatible new configuration");
+      return -1;
+    }
+  }

   /* everything is good so we shall use the new config */
   config_free(config);
   /* warn about obsolete directives */
   /* everything is good so we shall use the new config */
   config_free(config);
   /* warn about obsolete directives */


@@ -1371,6 +1402,12 @@ int config_read(int server) {
     error(0, "'allow' will be removed in a future version");
   if(c->trust.n)
     error(0, "'trust' will be removed in a future version");
     error(0, "'allow' will be removed in a future version");
   if(c->trust.n)
     error(0, "'trust' will be removed in a future version");

+  if(!c->lock)
+    error(0, "'lock' will be removed in a future version");
+  if(c->gap)
+    error(0, "'gap' will be removed in a future version");
+  if(c->prefsync)
+    error(0, "'prefsync' will be removed in a future version");

   config = c;
   return 0;
 }
   config = c;
   return 0;
 }

diff --git a/lib/configuration.h b/lib/configuration.h
index 4cb56774671ebeec323d4069d6528bb1d75a919f..e9fce7359a48da7aa409a7e4169e32a2f879f78c 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -292,7 +292,8 @@ struct config {
 extern struct config *config;
 /* the current configuration */
 
 extern struct config *config;
 /* the current configuration */
 

-int config_read(int server);
+int config_read(int server,
+                const struct config *oldconfig);

 /* re-read config, return 0 on success or non-0 on error.
  * Only updates @config@ if the new configuration is valid. */
 
 /* re-read config, return 0 on success or non-0 on error.
  * Only updates @config@ if the new configuration is valid. */
 

diff --git a/server/choose.c b/server/choose.c
index bc824752331bbdd89c7b0fc6170eda15fcbd0d6b..10ed360d962ad22113ea41418e029211c1cc1a02 100644 (file)
--- a/server/choose.c
+++ b/server/choose.c
@@ -281,7 +281,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   /* Find out current queue/recent list */
   queue_read();
   recent_read();
   /* Find out current queue/recent list */
   queue_read();
   recent_read();

diff --git a/server/dbupgrade.c b/server/dbupgrade.c
index bd08eed738e0dc7ee518a2072dc87eb8d4999e0f..09dd78947b91a2dcc6b612c2e58253f1f52c4909 100644 (file)
--- a/server/dbupgrade.c
+++ b/server/dbupgrade.c
@@ -333,7 +333,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   /* Open the database */
   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_OPEN_FOR_UPGRADE);
   /* Open the database */
   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_OPEN_FOR_UPGRADE);

diff --git a/server/deadlock.c b/server/deadlock.c
index 3c1335133b6d994d936b53e49178a80b54ba8a3a..d90a123b95e43788f8b6a44633a37af06b381c26 100644 (file)
--- a/server/deadlock.c
+++ b/server/deadlock.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   info("started");
   trackdb_init(TRACKDB_NO_RECOVER);
   while(getppid() != 1) {
   info("started");
   trackdb_init(TRACKDB_NO_RECOVER);
   while(getppid() != 1) {

diff --git a/server/disorderd.c b/server/disorderd.c
index 74fc07eb4a7d3c49059b3d54d5383f56d6f0d944..ab6221a2c79b20cb55973a9ae6180c0c38729fc6 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -230,7 +230,7 @@ int main(int argc, char **argv) {
   if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
   /* read config */
   config_uaudio_apis = uaudio_apis;
   if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
   /* read config */
   config_uaudio_apis = uaudio_apis;

-  if(config_read(1))
+  if(config_read(1,  NULL))

     fatal(0, "cannot read configuration");
   /* make sure the home directory exists and has suitable permissions */
   make_home();
     fatal(0, "cannot read configuration");
   /* make sure the home directory exists and has suitable permissions */
   make_home();

diff --git a/server/dump.c b/server/dump.c
index e08b32f6f21e7fcb5da022c4f6ca1177931c02c0..4b023aa0b37bff5285fb6bacfee5ac85c8c7bca7 100644 (file)
--- a/server/dump.c
+++ b/server/dump.c
@@ -473,7 +473,7 @@ int main(int argc, char **argv) {
       fatal(0, "specify only a dump file name");
     path = argv[optind];
   }
       fatal(0, "specify only a dump file name");
     path = argv[optind];
   }

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   trackdb_init(recover|TRACKDB_MAY_CREATE);
   trackdb_open(TRACKDB_NO_UPGRADE);
   if(dump) {
   trackdb_init(recover|TRACKDB_MAY_CREATE);
   trackdb_open(TRACKDB_NO_UPGRADE);
   if(dump) {

diff --git a/server/normalize.c b/server/normalize.c
index db5b9d517b11ee8189b565ed2358344b6edf6f22..717f3cc17c7f239a095f35340235aebc5cf643e8 100644 (file)
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -141,7 +141,7 @@ int main(int argc, char attribute((unused)) **argv) {
     default: fatal(0, "invalid option");
     }
   }
     default: fatal(0, "invalid option");
     }
   }

-  if(config_read(1))
+  if(config_read(1, NULL))

     fatal(0, "cannot read configuration");
   if(logsyslog) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     fatal(0, "cannot read configuration");
   if(logsyslog) {
     openlog(progname, LOG_PID, LOG_DAEMON);

diff --git a/server/rescan.c b/server/rescan.c
index 1380e24fd493709bc188011b0b9104b2c745cfd2..ebff0989d04699cae4bd03fde9d3e2eb965ec6f0 100644 (file)
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -380,7 +380,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   xnice(config->nice_rescan);
   sa.sa_handler = signal_handler;
   sa.sa_flags = SA_RESTART;
   xnice(config->nice_rescan);
   sa.sa_handler = signal_handler;
   sa.sa_flags = SA_RESTART;

diff --git a/server/speaker.c b/server/speaker.c
index b41c94f844d8f9cee721c6d959c174ddc09ddda5..adda2eb5030b604debd9524029aff5901003591b 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -608,7 +608,7 @@ static void mainloop(void) {
          break;
        case SM_RELOAD:
           D(("SM_RELOAD"));
          break;
        case SM_RELOAD:
           D(("SM_RELOAD"));

-         if(config_read(1))
+         if(config_read(1, NULL))

             error(0, "cannot read configuration");
           info("reloaded configuration");
          break;
             error(0, "cannot read configuration");
           info("reloaded configuration");
          break;


@@ -707,7 +707,7 @@ int main(int argc, char **argv) {
     log_default = &log_syslog;
   }
   config_uaudio_apis = uaudio_apis;
     log_default = &log_syslog;
   }
   config_uaudio_apis = uaudio_apis;

-  if(config_read(1)) fatal(0, "cannot read configuration");
+  if(config_read(1, NULL)) fatal(0, "cannot read configuration");

   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
   /* set nice value */
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
   /* set nice value */

diff --git a/server/state.c b/server/state.c
index a881e9b1fa26060def172210081c2165e61dfcbb..1c1e2aa1f68ee06e45dab445e5e3edc334ae1bab 100644 (file)
--- a/server/state.c
+++ b/server/state.c
@@ -164,7 +164,7 @@ int reconfigure(ev_source *ev, int reload) {
     /* Close the track database */
     trackdb_close();
     /* (Re-)read the configuration */
     /* Close the track database */
     trackdb_close();
     /* (Re-)read the configuration */

-    if(config_read(1/*server*/))
+    if(config_read(1/*server*/, config))

       ret = -1;
     else {
       /* Tell the speaker it needs to reload its config too. */
       ret = -1;
     else {
       /* Tell the speaker it needs to reload its config too. */

diff --git a/server/stats.c b/server/stats.c
index 81c92f44473570997c0084cd84f0747bb3a078a7..ad35cb8bfbb5ec828c87e77f7def122e28de21af 100644 (file)
--- a/server/stats.c
+++ b/server/stats.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }

-  if(config_read(0))
+  if(config_read(0, NULL))

     fatal(0, "cannot read configuration");
   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_NO_UPGRADE);
     fatal(0, "cannot read configuration");
   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_NO_UPGRADE);

diff --git a/server/trackname.c b/server/trackname.c
index ec84f682a3eb660e79ce532d08ca9cc2112ca436..b661e0cd839611f861b3363eab5e95beebcc13e2 100644 (file)
--- a/server/trackname.c
+++ b/server/trackname.c
@@ -57,7 +57,7 @@ int main(int argc, char **argv) {
   }
   if(argc - optind < 3) fatal(0, "not enough arguments");
   if(argc - optind > 3) fatal(0, "too many arguments");
   }
   if(argc - optind < 3) fatal(0, "not enough arguments");
   if(argc - optind > 3) fatal(0, "too many arguments");

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   s = trackname_part(argv[optind], argv[optind+1], argv[optind+2]);
   if(!s) fatal(0, "trackname_part returned NULL");
   xprintf("%s\n", nullcheck(utf82mb(s)));
   s = trackname_part(argv[optind], argv[optind+1], argv[optind+2]);
   if(!s) fatal(0, "trackname_part returned NULL");
   xprintf("%s\n", nullcheck(utf82mb(s)));