[systemd-commits] 3 commits - TODO man/journalctl.xml src/journal src/shared

[Lennart Poettering]

 TODO                     |    1 +
 man/journalctl.xml       |   12 ++++++++----
 src/journal/journalctl.c |    4 ++++
 src/shared/pager.c       |    4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit fe59e38bef69568c385d10761132458606cdd896
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Mar 7 21:49:12 2013 +0100

    journalctl: imply -n1000 when -e is used
    
    Make sure the pager does not have to buffer an unbounded number of log
    messages, by default.

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 201f66a..3db5e5d 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -168,10 +168,14 @@
 
                                 <listitem><para>Immediately jump to
                                 the end of the journal inside the
-                                implied pager tool. Very useful in
-                                combination with the
-                                <option>-b</option> option. Note that
-                                this is only supported for the
+                                implied pager tool. This implies
+                                <option>-n1000</option> to guarantee
+                                that the pager won't buffer logs of
+                                unbounded size. This may be overriden
+                                with an explicit <option>-n</option>
+                                with some other numeric value on the
+                                command line. Note that this option is
+                                only supported for the
                                 <citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                                 pager.</para></listitem>
                         </varlistentry>
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5fb2db3..3682329 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -221,6 +221,10 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case 'e':
                         arg_pager_end = true;
+
+                        if (arg_lines < 0)
+                                arg_lines = 1000;
+
                         break;
 
                 case 'f':

commit 2e4015f3e73173a4346c03a1ed7962f7d3423ed2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Mar 7 21:48:17 2013 +0100

    update TODO

diff --git a/TODO b/TODO
index 4419582..47c91fd 100644
--- a/TODO
+++ b/TODO
@@ -196,6 +196,7 @@ Features:
   - journalctl: show multiline log messages sanely, expand tabs, and show all valid utf8 messages
   - journal: store euid in journal if it differs from uid
   - journal: sanely deal with entries which are larger than the individual file size, but where the components would fit
+  - journalctl: make journalctl smarter, and actually check groups that have access to /var/log/journal before printing message about recomming group membership for journal access
 
 * document:
   - document unit_name_mangle()

commit b47ef6a085bf06a12116422bb023f48a9eaf3379
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Mar 7 21:42:25 2013 +0100

    pager: add -M to $LESS to make the bottom line nicer

diff --git a/src/shared/pager.c b/src/shared/pager.c
index e9aa022..8dddf24 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -86,9 +86,9 @@ int pager_open(bool jump_to_end) {
                 close_pipe(fd);
 
                 if (jump_to_end)
-                        setenv("LESS", "FRSXK+G", 1);
+                        setenv("LESS", "FRSXMK+G", 1);
                 else
-                        setenv("LESS", "FRSXK", 1);
+                        setenv("LESS", "FRSXMK", 1);
 
                 /* Make sure the pager goes away when the parent dies */
                 if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)