File tree Expand file tree Collapse file tree 3 files changed +13
-5
lines changed
Expand file tree Collapse file tree 3 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 1+ 2003-10-07 Chris Dunlap <cdunlap@llnl.gov>
2+
3+ * etc/conman.conf, man/conman.conf.5.in: Tweaked timestamp logopt docs.
4+
152003-10-03 Chris Dunlap <cdunlap@llnl.gov>
26
37 * server-logfile.c, server-obj.c, server.h: Fixed newline timestamping
Original file line number Diff line number Diff line change 11##
22# ConMan daemon configuration file
33##
4- # $Id: conman.conf,v 1.13.2.4 2003/10/01 23:22:10 dun Exp $
4+ # $Id: conman.conf,v 1.13.2.5 2003/10/07 23:19:36 dun Exp $
55##
66# - Whitespace is ignored.
77# - Comments are ignored (from the pound char to the newline).
128128# - "sanitize" or "nosanitize" - sanitized logs convert non-printable
129129# characters into 7-bit printable characters.
130130# - "timestamp" or "notimestamp" - timestamped logs prepend each line
131- # with the current timestamp in "YYYY-MM-DD HH:MM:SS" format.
131+ # of console output with a timestamp in "YYYY-MM-DD HH:MM:SS" format.
132+ # This timestamp is generated when the first character following the
133+ # line break is output.
132134# The default is "nosanitize,notimestamp".
133135##
134136# GLOBAL logopts="nosanitize,notimestamp"
Original file line number Diff line number Diff line change 1- .\" $Id: conman.conf.5.in,v 1.5.2.6 2003/10/01 23:22:10 dun Exp $
1+ .\" $Id: conman.conf.5.in,v 1.5.2.7 2003/10/07 23:19:36 dun Exp $
22
33.TH CONMAN.CONF 5 "@DATE@" "@PROJECT@-@VERSION@" "LLNL"
44
@@ -100,8 +100,10 @@ logoptions include the following:
100100characters into 7-bit printable characters.
101101.br
102102.sp
103- \fB timestamp \fR or \fB notimestamp \fR - timestamped logs prepend each line with
104- the current timestamp in "YYYY-MM-DD HH:MM:SS" format.
103+ \fB timestamp \fR or \fB notimestamp \fR - timestamped logs prepend each line
104+ of console output with a timestamp in "YYYY-MM-DD HH:MM:SS" format. This
105+ timestamp is generated when the first character following the line break is
106+ output.
105107.br
106108.sp
107109The default is "\fB nosanitize \fR ,\fB notimestamp \fR ".
You can’t perform that action at this time.
0 commit comments