aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-15 14:35:42 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-15 14:35:42 +0000
commited5c1be29d5eed73ec272b47d1bad9eea5e44687 (patch)
tree85d45dda35a6d6af8e5c811091601b78005d6603
parente0f6f1ab615872a8fc75b6cc81bbf5712848cd86 (diff)
downloadpaludis-ed5c1be29d5eed73ec272b47d1bad9eea5e44687.tar.gz
paludis-ed5c1be29d5eed73ec272b47d1bad9eea5e44687.tar.xz
Better names for some output managers
-rw-r--r--paludis/environments/paludis/output_managers/Makefile.am10
-rw-r--r--paludis/environments/paludis/output_managers/keep_messages.part.conf (renamed from paludis/environments/paludis/output_managers/keep_messages.conf)4
-rw-r--r--paludis/environments/paludis/output_managers/keep_stdout_as_messages.part.conf (renamed from paludis/environments/paludis/output_managers/keep_stdout_as_messages.conf)2
-rw-r--r--paludis/environments/paludis/output_managers/logged.conf2
-rw-r--r--paludis/environments/paludis/output_managers/logged_only.part.conf (renamed from paludis/environments/paludis/output_managers/logged_only.conf)6
-rw-r--r--paludis/environments/paludis/output_managers/quiet.conf2
-rw-r--r--paludis/environments/paludis/output_managers/show_messages.part.conf (renamed from paludis/environments/paludis/output_managers/show_messages.conf)2
7 files changed, 14 insertions, 14 deletions
diff --git a/paludis/environments/paludis/output_managers/Makefile.am b/paludis/environments/paludis/output_managers/Makefile.am
index 5137a58..fd16890 100644
--- a/paludis/environments/paludis/output_managers/Makefile.am
+++ b/paludis/environments/paludis/output_managers/Makefile.am
@@ -12,13 +12,13 @@ DEFS= \
shareenvpaludisdir = $(sharedir)/paludis/environments/paludis/output_managers
dist_shareenvpaludis_DATA = \
- keep_messages.conf \
- keep_stdout_as_messages.conf \
logged.conf \
- logged_only.conf \
quiet.conf \
- show_messages.conf \
- standard.conf
+ standard.conf \
+ keep_messages.part.conf \
+ keep_stdout_as_messages.part.conf \
+ logged_only.part.conf \
+ show_messages.part.conf
logdir = /var/log/paludis
diff --git a/paludis/environments/paludis/output_managers/keep_messages.conf b/paludis/environments/paludis/output_managers/keep_messages.part.conf
index 38f7505..5cc0f7b 100644
--- a/paludis/environments/paludis/output_managers/keep_messages.conf
+++ b/paludis/environments/paludis/output_managers/keep_messages.part.conf
@@ -1,7 +1,7 @@
-# Keep message logs
+# Keep message logs, ignore stdout / stderr. Not directly usable.
handler = messages_to_stdout
-child = keep_stdout_as_messages
+child = keep_stdout_as_messages.part
format_debug =
format_info = --- %{message}
format_warn = *** %{message}
diff --git a/paludis/environments/paludis/output_managers/keep_stdout_as_messages.conf b/paludis/environments/paludis/output_managers/keep_stdout_as_messages.part.conf
index 6e45680..ebbb5ee 100644
--- a/paludis/environments/paludis/output_managers/keep_stdout_as_messages.conf
+++ b/paludis/environments/paludis/output_managers/keep_stdout_as_messages.part.conf
@@ -1,4 +1,4 @@
-# Keep message logs. For use by keep_messages; do not use directly.
+# Keep message logs. For use by keep_messages.part; do not use directly.
handler = file
stdout = /var/log/paludis/%{time}-%{action}-%{id}.messages
diff --git a/paludis/environments/paludis/output_managers/logged.conf b/paludis/environments/paludis/output_managers/logged.conf
index bf7a5ba..1e40328 100644
--- a/paludis/environments/paludis/output_managers/logged.conf
+++ b/paludis/environments/paludis/output_managers/logged.conf
@@ -2,5 +2,5 @@
# failure.
handler = tee
-children = standard logged_only keep_messages
+children = standard logged_only.part keep_messages.part
diff --git a/paludis/environments/paludis/output_managers/logged_only.conf b/paludis/environments/paludis/output_managers/logged_only.part.conf
index 5448b4c..08ba32d 100644
--- a/paludis/environments/paludis/output_managers/logged_only.conf
+++ b/paludis/environments/paludis/output_managers/logged_only.part.conf
@@ -1,6 +1,6 @@
-# Keep logs of output only, and discard on success. Used by logged and quiet,
-# but may be directly useful.
-
+# Keep logs of output only, and discard on success. Used by logged and quiet;
+# not directly usable.
+#
handler = file
stdout = /var/log/paludis/%{time}-%{action}-%{id}.out
stderr = ${stdout}
diff --git a/paludis/environments/paludis/output_managers/quiet.conf b/paludis/environments/paludis/output_managers/quiet.conf
index 8998124..a86ca5a 100644
--- a/paludis/environments/paludis/output_managers/quiet.conf
+++ b/paludis/environments/paludis/output_managers/quiet.conf
@@ -2,5 +2,5 @@
# on failure.
handler = tee
-children = logged_only show_messages keep_messages
+children = logged_only show_messages.part keep_messages.part
diff --git a/paludis/environments/paludis/output_managers/show_messages.conf b/paludis/environments/paludis/output_managers/show_messages.part.conf
index a6981b0..39cfa2c 100644
--- a/paludis/environments/paludis/output_managers/show_messages.conf
+++ b/paludis/environments/paludis/output_managers/show_messages.part.conf
@@ -1,4 +1,4 @@
-# Show messages only.
+# Show messages only. Not usable on its own.
handler = messages_to_stdout
child = standard