aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/output_managers
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-12 18:18:38 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-12 18:18:38 +0000
commitcaf15ee458dfe5c76cb36f20523597f88b38be70 (patch)
treeaf70171539548712d7e52babc5ace7591a6d7ec5 /paludis/environments/paludis/output_managers
parent23c22d5df8d5d47111d9c8e1e43e787f6a534b65 (diff)
downloadpaludis-caf15ee458dfe5c76cb36f20523597f88b38be70.tar.gz
paludis-caf15ee458dfe5c76cb36f20523597f88b38be70.tar.xz
Better default output manager
Diffstat (limited to 'paludis/environments/paludis/output_managers')
-rw-r--r--paludis/environments/paludis/output_managers/Makefile.am13
-rw-r--r--paludis/environments/paludis/output_managers/logged.conf5
-rw-r--r--paludis/environments/paludis/output_managers/logged_only.conf7
3 files changed, 23 insertions, 2 deletions
diff --git a/paludis/environments/paludis/output_managers/Makefile.am b/paludis/environments/paludis/output_managers/Makefile.am
index 07df6b425..ed7a08050 100644
--- a/paludis/environments/paludis/output_managers/Makefile.am
+++ b/paludis/environments/paludis/output_managers/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail .keep
BUILT_SOURCES =
MAINTAINERCLEANFILES = Makefile.in
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
@@ -12,7 +12,16 @@ DEFS= \
shareenvpaludisdir = $(sharedir)/paludis/environments/paludis/output_managers
dist_shareenvpaludis_DATA = \
- standard.conf
+ standard.conf \
+ logged.conf \
+ logged_only.conf
+
+logdir = /var/log/paludis
+
+log_DATA = .keep
+
+.keep :
+ touch $@
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/paludis/environments/paludis/output_managers/logged.conf b/paludis/environments/paludis/output_managers/logged.conf
new file mode 100644
index 000000000..338d31bf2
--- /dev/null
+++ b/paludis/environments/paludis/output_managers/logged.conf
@@ -0,0 +1,5 @@
+# Sends output to both standard and logged_only.
+
+handler = tee
+children = standard logged_only
+
diff --git a/paludis/environments/paludis/output_managers/logged_only.conf b/paludis/environments/paludis/output_managers/logged_only.conf
new file mode 100644
index 000000000..5884ea383
--- /dev/null
+++ b/paludis/environments/paludis/output_managers/logged_only.conf
@@ -0,0 +1,7 @@
+# This output handler keeps logs in /var/log/paludis/, but removes them on
+# success.
+
+handler = file
+stdout = /var/log/paludis/%{time}-%{action}-%{id}.out
+stderr = ${stdout}
+keep_on_success = false