[meta-oe] syslog-ng: adjust control socket location

Message ID 20220218011204.5913-1-pkj@axis.com
State New
Headers show
Series [meta-oe] syslog-ng: adjust control socket location | expand

Commit Message

Peter Kjellerstedt Feb. 18, 2022, 1:12 a.m. UTC
From: Ovidiu Panait <ovidiu.panait@windriver.com>

Commit [1] changed the pidfile dir to /var/run/syslog-ng. This also changed
the location where the control socket is searched for, causing the following
error with systemd:

root@qemux86-64:~# syslog-ng-ctl config
Error connecting control socket, socket='/var/run/syslog-ng/syslog-ng.ctl',
error='No such file or directory'

Update the systemd service file to point to the new location.

[1] 00d1d63e4f7f ("syslog-ng: provide correct PID directory location to
                   restart/stop syslog-ng daemon")

Signed-off-by: lmorales <luisalejandro.moralespena@windriver.com>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

This has already been backported to the hardknott branch, but is missing
in honister...

 .../files/syslog-ng.service-the-syslog-ng-service.patch         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Khem Raj Feb. 18, 2022, 2:18 a.m. UTC | #1
this is already applied in master via b57d824fdf822a4c3fdb153b92063f88705e3a6b

On Thu, Feb 17, 2022 at 5:12 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> From: Ovidiu Panait <ovidiu.panait@windriver.com>
>
> Commit [1] changed the pidfile dir to /var/run/syslog-ng. This also changed
> the location where the control socket is searched for, causing the following
> error with systemd:
>
> root@qemux86-64:~# syslog-ng-ctl config
> Error connecting control socket, socket='/var/run/syslog-ng/syslog-ng.ctl',
> error='No such file or directory'
>
> Update the systemd service file to point to the new location.
>
> [1] 00d1d63e4f7f ("syslog-ng: provide correct PID directory location to
>                    restart/stop syslog-ng daemon")
>
> Signed-off-by: lmorales <luisalejandro.moralespena@windriver.com>
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
>
> This has already been backported to the hardknott branch, but is missing
> in honister...
>
>  .../files/syslog-ng.service-the-syslog-ng-service.patch         | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
> index 0e1d09492..733480030 100644
> --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
> +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
> @@ -38,7 +38,7 @@ index 0ccc2b9..7f08c0e 100644
>  -CONTROL_FILE=/var/run/syslog-ng.ctl
>  -PID_FILE=/var/run/syslog-ng.pid
>  +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist
> -+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl
> ++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl
>  +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid
>   OTHER_OPTIONS="--enable-core"
>  --
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95367): https://lists.openembedded.org/g/openembedded-devel/message/95367
> Mute This Topic: https://lists.openembedded.org/mt/89223977/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Peter Kjellerstedt Feb. 18, 2022, 4:32 p.m. UTC | #2
> -----Original Message-----
> From: openembedded-devel@lists.openembedded.org <openembedded-
> devel@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: den 18 februari 2022 03:19
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
> Subject: Re: [oe] [meta-oe][PATCH] syslog-ng: adjust control socket
> location
> 
> this is already applied in master via
> b57d824fdf822a4c3fdb153b92063f88705e3a6b

Duh. I apparently forgot the "[honister]" tag in the subject (see my 
original comment below).

> On Thu, Feb 17, 2022 at 5:12 PM Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
> >
> > From: Ovidiu Panait <ovidiu.panait@windriver.com>
> >
> > Commit [1] changed the pidfile dir to /var/run/syslog-ng. This also
> changed
> > the location where the control socket is searched for, causing the
> following
> > error with systemd:
> >
> > root@qemux86-64:~# syslog-ng-ctl config
> > Error connecting control socket, socket='/var/run/syslog-ng/syslog-
> ng.ctl',
> > error='No such file or directory'
> >
> > Update the systemd service file to point to the new location.
> >
> > [1] 00d1d63e4f7f ("syslog-ng: provide correct PID directory location to
> >                    restart/stop syslog-ng daemon")
> >
> > Signed-off-by: lmorales <luisalejandro.moralespena@windriver.com>
> > Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > ---
> >
> > This has already been backported to the hardknott branch, but is missing
> > in honister...
> >
> >  .../files/syslog-ng.service-the-syslog-ng-service.patch         | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-
> the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-
> ng/files/syslog-ng.service-the-syslog-ng-service.patch
> > index 0e1d09492..733480030 100644
> > --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-
> syslog-ng-service.patch
> > +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-
> syslog-ng-service.patch
> > @@ -38,7 +38,7 @@ index 0ccc2b9..7f08c0e 100644
> >  -CONTROL_FILE=/var/run/syslog-ng.ctl
> >  -PID_FILE=/var/run/syslog-ng.pid
> >  +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist
> > -+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl
> > ++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl
> >  +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid
> >   OTHER_OPTIONS="--enable-core"
> >  --

//Peter
Khem Raj Feb. 18, 2022, 5:02 p.m. UTC | #3
On Fri, Feb 18, 2022 at 8:32 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: openembedded-devel@lists.openembedded.org <openembedded-
> > devel@lists.openembedded.org> On Behalf Of Khem Raj
> > Sent: den 18 februari 2022 03:19
> > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
> > Subject: Re: [oe] [meta-oe][PATCH] syslog-ng: adjust control socket
> > location
> >
> > this is already applied in master via
> > b57d824fdf822a4c3fdb153b92063f88705e3a6b
>
> Duh. I apparently forgot the "[honister]" tag in the subject (see my
> original comment below).

I see thanks for update, maybe you want to resend it with that tag so
that Armin picks it


>
> > On Thu, Feb 17, 2022 at 5:12 PM Peter Kjellerstedt
> > <peter.kjellerstedt@axis.com> wrote:
> > >
> > > From: Ovidiu Panait <ovidiu.panait@windriver.com>
> > >
> > > Commit [1] changed the pidfile dir to /var/run/syslog-ng. This also
> > changed
> > > the location where the control socket is searched for, causing the
> > following
> > > error with systemd:
> > >
> > > root@qemux86-64:~# syslog-ng-ctl config
> > > Error connecting control socket, socket='/var/run/syslog-ng/syslog-
> > ng.ctl',
> > > error='No such file or directory'
> > >
> > > Update the systemd service file to point to the new location.
> > >
> > > [1] 00d1d63e4f7f ("syslog-ng: provide correct PID directory location to
> > >                    restart/stop syslog-ng daemon")
> > >
> > > Signed-off-by: lmorales <luisalejandro.moralespena@windriver.com>
> > > Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > ---
> > >
> > > This has already been backported to the hardknott branch, but is missing
> > > in honister...
> > >
> > >  .../files/syslog-ng.service-the-syslog-ng-service.patch         | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-
> > the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-
> > ng/files/syslog-ng.service-the-syslog-ng-service.patch
> > > index 0e1d09492..733480030 100644
> > > --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-
> > syslog-ng-service.patch
> > > +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-
> > syslog-ng-service.patch
> > > @@ -38,7 +38,7 @@ index 0ccc2b9..7f08c0e 100644
> > >  -CONTROL_FILE=/var/run/syslog-ng.ctl
> > >  -PID_FILE=/var/run/syslog-ng.pid
> > >  +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist
> > > -+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl
> > > ++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl
> > >  +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid
> > >   OTHER_OPTIONS="--enable-core"
> > >  --
>
> //Peter
>

Patch

diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
index 0e1d09492..733480030 100644
--- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
+++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
@@ -38,7 +38,7 @@  index 0ccc2b9..7f08c0e 100644
 -CONTROL_FILE=/var/run/syslog-ng.ctl
 -PID_FILE=/var/run/syslog-ng.pid
 +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist
-+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl
++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl
 +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid
  OTHER_OPTIONS="--enable-core"
 --