cups-browsed: Do not write any log messages directly to stderr

(cherry picked from commit aa19fa3f21d9f00150e188c3cb84b39965c23367)

diff --git a/NEWS b/NEWS
index fb5c87d262df1d26a9ef1937206ac1c43eb31a8b..917d8d3a8bdd98034b501be47550e0278ca3c068 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ NEWS - OpenPrinting CUPS Filters v1.27.5 - 2020-06-05
 
 CHANGES IN V1.28.0
 
+       - cups-browsed: Do not write any log messages directly to
+         stderr, there were some concerning timeouts on queue
+         creation (Issue #260).
        - Build system: Fix cross-compilation without DejaVu test font
          in configure.ac (Issue #262, Pull request #263).
        - libcupsfilters: Respect the fact that PPD keywords

diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
index ec1944d814b473bf9475ad97a42da5752b930017..bdb8046e36f2f04ef5465ad204278425930cd9e6 100644 (file)
--- a/utils/cups-browsed.c
+++ b/utils/cups-browsed.c
@@ -7782,7 +7782,7 @@ gboolean update_cups_queues(gpointer unused) {
       /* cups-browsed tried to add this print queue unsuccessfully for too
         many times due to timeouts - Skip print queue creation for this one */
       if (p->timeouted >= HttpMaxRetries) {
-       fprintf(stderr, "Max number of retries (%d) for creating print queue %s reached, skipping it.\n",
+       debug_printf("Max number of retries (%d) for creating print queue %s reached, skipping it.\n",
                HttpMaxRetries, p->queue_name);
        continue;
       }
@@ -8708,7 +8708,8 @@ gboolean update_cups_queues(gpointer unused) {
         to STATUS_CONFIRMED and experience the timeout */
       /* If no timeout has happened, clear p->timeouted */
       if (timeout_reached == 1) {
-       fprintf(stderr, "Timeout happened during creation of the queue %s, turn on DebugLogging for more info.\n", p->queue_name);
+       debug_printf("Timeout happened during creation of the queue %s.\n",
+                    p->queue_name);
        p->timeouted ++;
        debug_printf("The queue %s already timeouted %d times in a row.\n",
                     p->queue_name, p->timeouted);