|
 |
46eaa5 |
From 35fbb9fa6341ed81b5eb6a8049d1982b2ecf4aac Mon Sep 17 00:00:00 2001
|
|
|
46eaa5 |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
|
46eaa5 |
Date: Fri, 5 Sep 2014 15:16:34 +0200
|
|
|
46eaa5 |
Subject: [PATCH] data: remove rsyslog config files
|
|
|
46eaa5 |
|
|
|
46eaa5 |
Many systems don't use rsyslog, others don't need seperate syslog files
|
|
|
46eaa5 |
for vdagent.
|
|
|
46eaa5 |
|
|
|
46eaa5 |
With systemd journal, It's possible to filter
|
|
|
46eaa5 |
spice-vdagent/spice-vdagentd log messages out of /var/log/messages:
|
|
|
46eaa5 |
journalctl SYSLOG_IDENTIFIER=spice-vdagent SLOG_IDENTIFIER=spice-vdagentd
|
|
|
46eaa5 |
|
|
|
46eaa5 |
This simplify spice-vdagent packaging and updates, since there are no
|
|
|
46eaa5 |
config files to deal with.
|
|
|
46eaa5 |
|
|
|
46eaa5 |
Related:
|
|
|
46eaa5 |
https://bugzilla.redhat.com/show_bug.cgi?id=1136881
|
|
|
46eaa5 |
(cherry picked from commit 072fb03fa47b18dd6cdd3b5c764d59e06fc5815e)
|
|
|
46eaa5 |
---
|
|
|
46eaa5 |
Makefile.am | 4 ----
|
|
|
46eaa5 |
data/rsyslog.d/spice-vdagentd.conf | 4 ----
|
|
|
46eaa5 |
2 files changed, 8 deletions(-)
|
|
|
46eaa5 |
delete mode 100644 data/rsyslog.d/spice-vdagentd.conf
|
|
|
46eaa5 |
|
|
|
46eaa5 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
46eaa5 |
index 8a65704..a06a259 100644
|
|
|
46eaa5 |
--- a/Makefile.am
|
|
|
46eaa5 |
+++ b/Makefile.am
|
|
|
46eaa5 |
@@ -51,9 +51,6 @@ gdmautostart2_DATA = $(top_srcdir)/data/spice-vdagent.desktop
|
|
|
46eaa5 |
install-data-local:
|
|
|
46eaa5 |
$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd
|
|
|
46eaa5 |
|
|
|
46eaa5 |
-rsyslogdir = $(sysconfdir)/rsyslog.d
|
|
|
46eaa5 |
-rsyslog_DATA = $(top_srcdir)/data/rsyslog.d/spice-vdagentd.conf
|
|
|
46eaa5 |
-
|
|
|
46eaa5 |
if INIT_SCRIPT_RED_HAT
|
|
|
46eaa5 |
initdir = $(sysconfdir)/rc.d/init.d
|
|
|
46eaa5 |
init_SCRIPTS = $(top_srcdir)/data/spice-vdagentd
|
|
|
46eaa5 |
@@ -83,7 +80,6 @@ EXTRA_DIST = \
|
|
|
46eaa5 |
README.RHEL-5 \
|
|
|
46eaa5 |
data/70-spice-vdagentd.rules \
|
|
|
46eaa5 |
data/modules-load.d/spice-vdagentd.conf \
|
|
|
46eaa5 |
- data/rsyslog.d/spice-vdagentd.conf \
|
|
|
46eaa5 |
data/spice-vdagent.desktop \
|
|
|
46eaa5 |
data/spice-vdagentd \
|
|
|
46eaa5 |
data/spice-vdagentd.service \
|
|
|
46eaa5 |
diff --git a/data/rsyslog.d/spice-vdagentd.conf b/data/rsyslog.d/spice-vdagentd.conf
|
|
|
46eaa5 |
deleted file mode 100644
|
|
|
46eaa5 |
index 2437ba0..0000000
|
|
|
46eaa5 |
--- a/data/rsyslog.d/spice-vdagentd.conf
|
|
|
46eaa5 |
+++ /dev/null
|
|
|
46eaa5 |
@@ -1,4 +0,0 @@
|
|
|
46eaa5 |
-# A template to for higher precision timestamps + severity logging
|
|
|
46eaa5 |
-$template SpiceTmpl,"%TIMESTAMP%.%TIMESTAMP:::date-subseconds% %syslogtag% %syslogseverity-text%:%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
|
|
|
46eaa5 |
-
|
|
|
46eaa5 |
-:programname, startswith, "spice-vdagent" /var/log/spice-vdagent.log;SpiceTmpl
|