[PATCH] rngd: fix --debug to also filter syslog() calls

[PATCH] rngd: fix --debug to also filter syslog() calls

[Yann Dirson]

From: Yann Dirson <yann@blade-group.com>

Debug logs were only controlled by --debug flag while in --foreground mode.
In --daemon mode (the default for us) /var/log/message got stuffed with
details of entropy pool refilling, which is useless in production, and
hamful when log rotation then gets rid of the more useful logs.

This change makes the two modes consistently only produce debug logs when
--debug is specified.

Signed-off-by: Yann Dirson <yann@blade-group.com>
---
 .../rng-tools/rngd-debug-filter.patch         | 22 +++++++++++++++++++
 .../rng-tools/rng-tools_6.10.bb               |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch

diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch b/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
new file mode 100644
index 0000000000..320f0257e6
--- /dev/null
+++ b/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
@@ -0,0 +1,22 @@
+Index: git/rngd.h
+===================================================================
+--- git.orig/rngd.h
++++ git/rngd.h
+@@ -145,13 +145,13 @@ extern bool quiet;
+ #define message(priority,fmt,args...) do { \
+ 	if (quiet) \
+ 		break;\
++	if (arguments->debug == false && LOG_PRI(priority) == LOG_DEBUG) \
++		break;\
+ 	if (am_daemon) { \
+ 		syslog((priority), fmt, ##args); \
+ 	} else if (!msg_squash) { \
+-		if ((LOG_PRI(priority) != LOG_DEBUG) || (arguments->debug == true)) {\
+-			fprintf(stderr, fmt, ##args); \
+-			fflush(stderr); \
+-		} \
++		fprintf(stderr, fmt, ##args); \
++		fflush(stderr); \
+ 	} \
+ } while (0)
+ 
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.10.bb b/meta/recipes-support/rng-tools/rng-tools_6.10.bb
index 3f9720e406..98fb7aa775 100644
--- a/meta/recipes-support/rng-tools/rng-tools_6.10.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_6.10.bb
@@ -12,6 +12,7 @@ SRC_URI = "\
     git://github.com/nhorman/rng-tools.git \
     file://a4b6d9ce64f132e463b9091d0536913ddaf11516.patch \
     file://dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch \
+    file://rngd-debug-filter.patch \
     file://init \
     file://default \
     file://rngd.service \
-- 
2.28.0

Re: [OE-core] [PATCH] rngd: fix --debug to also filter syslog() calls

[Richard Purdie]

On Fri, 2020-10-09 at 10:55 +0200, Yann Dirson wrote:
> From: Yann Dirson <yann@blade-group.com>
> 
> Debug logs were only controlled by --debug flag while in --foreground mode.
> In --daemon mode (the default for us) /var/log/message got stuffed with
> details of entropy pool refilling, which is useless in production, and
> hamful when log rotation then gets rid of the more useful logs.
> 
> This change makes the two modes consistently only produce debug logs when
> --debug is specified.
> 
> Signed-off-by: Yann Dirson <yann@blade-group.com>
> ---
>  .../rng-tools/rngd-debug-filter.patch         | 22 +++++++++++++++++++
>  .../rng-tools/rng-tools_6.10.bb               |  1 +
>  2 files changed, 23 insertions(+)
>  create mode 100644 meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
> 
> diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch b/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
> new file mode 100644
> index 0000000000..320f0257e6
> --- /dev/null


This patch has no description, author or Upstream-Status: information
in it. It needs such information to be considered. It would be helpful
if the change was submitted upstream too, not sure if you've looked at
that? We try not to carry patches if we can.

Cheers,

Richard

> +++ b/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
> @@ -0,0 +1,22 @@
> +Index: git/rngd.h
> +===================================================================
> +--- git.orig/rngd.h
> ++++ git/rngd.h
> +@@ -145,13 +145,13 @@ extern bool quiet;
> + #define message(priority,fmt,args...) do { \
> + 	if (quiet) \
> + 		break;\
> ++	if (arguments->debug == false && LOG_PRI(priority) == LOG_DEBUG) \
> ++		break;\
> + 	if (am_daemon) { \
> + 		syslog((priority), fmt, ##args); \
> + 	} else if (!msg_squash) { \
> +-		if ((LOG_PRI(priority) != LOG_DEBUG) || (arguments->debug == true)) {\
> +-			fprintf(stderr, fmt, ##args); \
> +-			fflush(stderr); \
> +-		} \
> ++		fprintf(stderr, fmt, ##args); \
> ++		fflush(stderr); \
> + 	} \
> + } while (0)
> + 
> diff --git a/meta/recipes-support/rng-tools/rng-tools_6.10.bb b/meta/recipes-support/rng-tools/rng-tools_6.10.bb
> index 3f9720e406..98fb7aa775 100644
> --- a/meta/recipes-support/rng-tools/rng-tools_6.10.bb
> +++ b/meta/recipes-support/rng-tools/rng-tools_6.10.bb
> @@ -12,6 +12,7 @@ SRC_URI = "\
>      git://github.com/nhorman/rng-tools.git \
>      file://a4b6d9ce64f132e463b9091d0536913ddaf11516.patch \
>      file://dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch \
> +    file://rngd-debug-filter.patch \
>      file://init \
>      file://default \
>      file://rngd.service \
> 
> 

Re: [OE-core] [PATCH] rngd: fix --debug to also filter syslog() calls

[Yann Dirson]

[-- Attachment #1: Type: text/plain, Size: 3308 bytes --]

Le ven. 9 oct. 2020 à 15:00, Richard Purdie <
richard.purdie@linuxfoundation.org> a écrit :

> On Fri, 2020-10-09 at 10:55 +0200, Yann Dirson wrote:
> > From: Yann Dirson <yann@blade-group.com>
> >
> > Debug logs were only controlled by --debug flag while in --foreground
> mode.
> > In --daemon mode (the default for us) /var/log/message got stuffed with
> > details of entropy pool refilling, which is useless in production, and
> > hamful when log rotation then gets rid of the more useful logs.
> >
> > This change makes the two modes consistently only produce debug logs when
> > --debug is specified.
> >
> > Signed-off-by: Yann Dirson <yann@blade-group.com>
> > ---
> >  .../rng-tools/rngd-debug-filter.patch         | 22 +++++++++++++++++++
> >  .../rng-tools/rng-tools_6.10.bb               |  1 +
> >  2 files changed, 23 insertions(+)
> >  create mode 100644
> meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
> >
> > diff --git
> a/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
> b/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
> > new file mode 100644
> > index 0000000000..320f0257e6
> > --- /dev/null
>
>
> This patch has no description, author or Upstream-Status: information
> in it. It needs such information to be considered. It would be helpful
> if the change was submitted upstream too, not sure if you've looked at
> that? We try not to carry patches if we can.
>

Lignthnig-speed upstream merged the patch after I re-rolled, is it worth a
v3 tagged "accepted" ?


> Cheers,
>
> Richard
>
> > +++ b/meta/recipes-support/rng-tools/rng-tools/rngd-debug-filter.patch
> > @@ -0,0 +1,22 @@
> > +Index: git/rngd.h
> > +===================================================================
> > +--- git.orig/rngd.h
> > ++++ git/rngd.h
> > +@@ -145,13 +145,13 @@ extern bool quiet;
> > + #define message(priority,fmt,args...) do { \
> > +     if (quiet) \
> > +             break;\
> > ++    if (arguments->debug == false && LOG_PRI(priority) == LOG_DEBUG) \
> > ++            break;\
> > +     if (am_daemon) { \
> > +             syslog((priority), fmt, ##args); \
> > +     } else if (!msg_squash) { \
> > +-            if ((LOG_PRI(priority) != LOG_DEBUG) || (arguments->debug
> == true)) {\
> > +-                    fprintf(stderr, fmt, ##args); \
> > +-                    fflush(stderr); \
> > +-            } \
> > ++            fprintf(stderr, fmt, ##args); \
> > ++            fflush(stderr); \
> > +     } \
> > + } while (0)
> > +
> > diff --git a/meta/recipes-support/rng-tools/rng-tools_6.10.bb
> b/meta/recipes-support/rng-tools/rng-tools_6.10.bb
> > index 3f9720e406..98fb7aa775 100644
> > --- a/meta/recipes-support/rng-tools/rng-tools_6.10.bb
> > +++ b/meta/recipes-support/rng-tools/rng-tools_6.10.bb
> > @@ -12,6 +12,7 @@ SRC_URI = "\
> >      git://github.com/nhorman/rng-tools.git \
> >      file://a4b6d9ce64f132e463b9091d0536913ddaf11516.patch \
> >      file://dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch \
> > +    file://rngd-debug-filter.patch \
> >      file://init \
> >      file://default \
> >      file://rngd.service \
> > 
> >
>
>

-- 
Yann Dirson <yann@blade-group.com>
Blade / Shadow -- http://shadow.tech

[-- Attachment #2: Type: text/html, Size: 5016 bytes --]

Re: [OE-core] [PATCH] rngd: fix --debug to also filter syslog() calls

[Richard Purdie]

On Fri, 2020-10-09 at 16:19 +0200, Yann Dirson wrote:
> 
> 
> Le ven. 9 oct. 2020 à 15:00, Richard Purdie <
> richard.purdie@linuxfoundation.org> a écrit :
> > On Fri, 2020-10-09 at 10:55 +0200, Yann Dirson wrote:
> > > From: Yann Dirson <yann@blade-group.com>
> > > 
> > > Debug logs were only controlled by --debug flag while in --
> > foreground mode.
> > > In --daemon mode (the default for us) /var/log/message got
> > stuffed with
> > > details of entropy pool refilling, which is useless in
> > production, and
> > > hamful when log rotation then gets rid of the more useful logs.
> > > 
> > > This change makes the two modes consistently only produce debug
> > logs when
> > > --debug is specified.
> > > 
> > > Signed-off-by: Yann Dirson <yann@blade-group.com>
> > > ---
> > >  .../rng-tools/rngd-debug-filter.patch         | 22
> > +++++++++++++++++++
> > >  .../rng-tools/rng-tools_6.10.bb               |  1 +
> > >  2 files changed, 23 insertions(+)
> > >  create mode 100644 meta/recipes-support/rng-tools/rng-
> > tools/rngd-debug-filter.patch
> > > 
> > > diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd-debug-
> > filter.patch b/meta/recipes-support/rng-tools/rng-tools/rngd-debug-
> > filter.patch
> > > new file mode 100644
> > > index 0000000000..320f0257e6
> > > --- /dev/null
> > 
> > 
> > This patch has no description, author or Upstream-Status:
> > information
> > in it. It needs such information to be considered. It would be
> > helpful
> > if the change was submitted upstream too, not sure if you've looked
> > at
> > that? We try not to carry patches if we can.
> 
> Lignthnig-speed upstream merged the patch after I re-rolled, is it
> worth a v3 tagged "accepted" ?

Please, it can be "Backport" now since it is!

Thanks for sending it, saves us carrying the patch and helps upstream
too.

Cheers,

Richard