2022-12-24 Fred Gleason <[email protected]>

* Added a 'ServiceStartDelay=' directive to the '[Tuning]' section of rd.conf(5). * Added 'sound.target' to the 'After=' directive in 'systemd/rivendell.service.in'. Signed-off-by: Fred Gleason <[email protected]>
ElvishArtisan · Dec 24, 2022 · b59e3b8 · b59e3b8
1 parent eb3cf2f
commit b59e3b8
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -23863,3 +23863,8 @@
 	* Incremented the version of the 'rivwebpyapi' PyPI package to
 	4.0.0b4.
 	* Incremented the package version to 4.0.0rc0int12.
+2022-12-24 Fred Gleason <[email protected]>
+	* Added a 'ServiceStartDelay=' directive to the '[Tuning]' section
+	of rd.conf(5).
+	* Added 'sound.target' to the 'After=' directive in
+	'systemd/rivendell.service.in'.
diff --git a/conf/rd.conf-sample b/conf/rd.conf-sample
@@ -176,6 +176,11 @@ TranscodingDelay=0
 ; then '/tmp' will be used.
 ;TempDirectory=/tmp
 
+; Seconds to wait before rdservice(8) launches the caed(8) daemon. Needed
+; in some setups to allow other subsystems --e.g. ALSA -- to stabilize after
+; bootup.
+;ServiceStartupDelay=5 
+
 [Hacks]
 ; Completely disable maintenance checks on this host.
 ; DisableMaintChecks=Yes

diff --git a/docs/manpages/rd.conf.xml b/docs/manpages/rd.conf.xml
@@ -6,7 +6,7 @@
   <refmeta>
     <refentrytitle>rd.conf</refentrytitle>
     <manvolnum>5</manvolnum>
-    <refmiscinfo class='source'>October 2019</refmiscinfo>
+    <refmiscinfo class='source'>December 2022</refmiscinfo>
     <refmiscinfo class='manual'>Linux Audio Manual</refmiscinfo>
   </refmeta>
   <refnamediv>
@@ -715,6 +715,21 @@
 	 aspects of Rivendell.
        </para>
        <variablelist>
+	 <varlistentry>
+	   <term>
+	     <userinput>ServiceStartDelay = <replaceable>secs</replaceable></userinput>
+	   </term>
+	   <listitem>
+	     <para>
+	       Instruct <command>rdservice</command><manvolnum>8</manvolnum>
+	       to wait for <replaceable>secs</replaceable> seconds before
+	       initiating service startup. Useful for giving certain
+	       subsystems --e.g. ALSA -- time to reach a stable state during
+	       system bootup (but see BUGS below). Default value is
+	       <userinput>5</userinput>.
+	     </para>
+	   </listitem>
+	 </varlistentry>
 	 <varlistentry>
 	   <term>
 	     <userinput>ServiceTimeout = <replaceable>secs</replaceable></userinput>
@@ -867,6 +882,15 @@
  </variablelist>
 </refsect1>
 
+<refsect1 id='bugs'><title>Bugs</title>
+<para>
+  In a perfect world, the <userinput>ServiceStartDelay=</userinput> parameter
+  would not be required. It is present to work around shortcomings in
+  <command>systemd</command><manvolnum>1</manvolnum>'s
+  <userinput>sound.target</userinput> service synchronization.
+</para>
+</refsect1>
+
 <refsect1 id='see_also'><title>See Also</title>
 <para>
   <citerefentry>

diff --git a/lib/rd.h b/lib/rd.h
@@ -626,6 +626,11 @@
  */
 #define RD_DEFAULT_SERVICE_TIMEOUT 30
 
+/*
+ * Default 'ServiceStartupDelay=' value in rd.conf(5) [seconds]
+ */
+#define RD_DEFAULT_SERVICE_STARTUP_DELAY 5
+
 /*
  * File Extension for RSS XML Feed Files
  */

diff --git a/lib/rdconfig.cpp b/lib/rdconfig.cpp
@@ -519,6 +519,13 @@ QString RDConfig::tempDirectory()
   return conf_temp_directory;
 }
 
+
+int RDConfig::serviceStartupDelay() const
+{
+  return conf_service_startup_delay;
+}
+
+
 QString RDConfig::sasStation() const
 {
   return conf_sas_station;
@@ -706,6 +713,8 @@ bool RDConfig::load()
   conf_service_timeout=
     profile->intValue("Tuning","ServiceTimeout",RD_DEFAULT_SERVICE_TIMEOUT);
   conf_temp_directory=profile->stringValue("Tuning","TempDirectory","");
+  conf_service_startup_delay=profile->intValue("Tuning","ServiceStartupDelay",
+					     RD_DEFAULT_SERVICE_STARTUP_DELAY);
   conf_sas_station=profile->stringValue("SASFilter","Station","");
   conf_sas_matrix=profile->intValue("SASFilter","Matrix",0);
   conf_sas_base_cart=profile->intValue("SASFilter","BaseCart",0);
@@ -820,6 +829,7 @@ void RDConfig::clear()
   conf_transcoding_delay=0;
   conf_service_timeout=RD_DEFAULT_SERVICE_TIMEOUT;
   conf_temp_directory="";
+  conf_service_startup_delay=RD_DEFAULT_SERVICE_STARTUP_DELAY;
   conf_sas_station="";
   conf_sas_matrix=-1;
   conf_sas_base_cart=1;

diff --git a/lib/rdconfig.h b/lib/rdconfig.h
@@ -25,8 +25,8 @@
 
 #include <vector>
 
-#include <qhostaddress.h>
-#include <qstring.h>
+#include <QHostAddress>
+#include <QString>
 
 #include <rd.h>
 
@@ -123,6 +123,7 @@ class RDConfig
   int transcodingDelay() const;
   int serviceTimeout() const;
   QString tempDirectory();
+  int serviceStartupDelay() const;
   QString sasStation() const;
   int sasMatrix() const;
   unsigned sasBaseCart() const;
@@ -208,6 +209,7 @@ class RDConfig
   int conf_realtime_priority;
   int conf_service_timeout;
   QString conf_temp_directory;
+  int conf_service_startup_delay;
   QString conf_sas_station;
   int conf_sas_matrix;
   unsigned conf_sas_base_cart;

diff --git a/rdservice/rdservice.cpp b/rdservice/rdservice.cpp
@@ -120,6 +120,15 @@ MainObject::MainObject(QObject *parent)
     }
   }
 
+  //
+  // Startup Delay
+  //
+  if(rda->config()->serviceStartupDelay()>0) {
+    rda->syslog(LOG_INFO,"delaying startup for %d seconds",
+		rda->config()->serviceStartupDelay());
+    sleep(rda->config()->serviceStartupDelay()); // Blunt object, but it works!
+  }
+
   //
   // Exit Timer
   //

diff --git a/systemd/rivendell.service.in b/systemd/rivendell.service.in
@@ -2,7 +2,7 @@
 
 [Unit]
 Description=Rivendell Radio Automation System
-After=network.target remote-fs.target nss-lookup.target
+After=network.target remote-fs.target nss-lookup.target sound.target
 
 [Service]
 LimitNOFILE=4096