From: Mike Brady <mikebrady@eircom.net>
Date: Fri, 25 May 2018 12:48:12 +0000 (+0100)
Subject: Include all RTSP messages in debug level 2 except for the OPTIONS message; tidy up... 
X-Git-Tag: 3.2RC10~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=452e1f72fb6245b68247eff48aecfa96ccc1433c;p=thirdparty%2Fshairport-sync.git

Include all RTSP messages in debug level 2 except for the OPTIONS message; tidy up some other debug messages.
---

diff --git a/audio_alsa.c b/audio_alsa.c
index 01e350bb..09903519 100644
--- a/audio_alsa.c
+++ b/audio_alsa.c
@@ -279,7 +279,7 @@ static int init(int argc, char **argv) {
 
     /* Get the output rate, which must be a multiple of 44,100*/
     if (config_lookup_int(config.cfg, "alsa.output_rate", &value)) {
-      debug(1, "Value read for output rate is %d.", value);
+      debug(1, "alsa output rate is %d frames per second", value);
       switch (value) {
       case 44100:
       case 88200:
diff --git a/rtsp.c b/rtsp.c
index 4ac036c3..4299167a 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -1880,7 +1880,7 @@ static void *rtsp_conversation_thread_func(void *pconn) {
     int debug_level = 3; // for printing the request and response
     reply = rtsp_read_request(conn, &req);
     if (reply == rtsp_read_request_response_ok) {
-      if (strcmp(req->method,"TEARDOWN")==0)
+      if (strcmp(req->method,"OPTIONS")!=0)
         debug_level=2;
       debug(debug_level, "RTSP thread %d received an RTSP Packet of type \"%s\":", conn->connection_number,
             req->method),
diff --git a/shairport.c b/shairport.c
index a168d36e..69109e8b 100644
--- a/shairport.c
+++ b/shairport.c
@@ -1057,7 +1057,7 @@ char pid_file_path_string[4096] = "\0";
 const char *pid_file_proc(void) {
   snprintf(pid_file_path_string, sizeof(pid_file_path_string), "%s/%s.pid", config.computed_piddir,
            daemon_pid_file_ident ? daemon_pid_file_ident : "unknown");
-  debug(1,"pid_file_path_string \"%s\".",pid_file_path_string);
+  // debug(1,"pid_file_path_string \"%s\".",pid_file_path_string);
   return pid_file_path_string;
 }
 
@@ -1383,7 +1383,7 @@ int main(int argc, char **argv) {
   /* Print out options */
   debug(1, "statistics_requester status is %d.", config.statistics_requested);
   debug(1, "daemon status is %d.", config.daemonise);
-  debug(1, "deamon pid file is \"%s\".", pid_file_proc());
+  debug(1, "deamon pid file path is \"%s\".", pid_file_proc());
   debug(1, "rtsp listening port is %d.", config.port);
   debug(1, "udp base port is %d.", config.udp_port_base);
   debug(1, "udp port range is %d.", config.udp_port_range);