journalctl: add --local switch

diff --git a/TODO b/TODO
index 7f19c3adcbba00a4e1b6444e6a9950ae86495d14..2fe676a724a97ec1800d49c889ac5238eb6bc917 100644 (file)
--- a/TODO
+++ b/TODO
@@ -18,6 +18,8 @@ Bugfixes:
 
 Features:
 
 
 Features:
 

+* Make -f in systemctl enable both --follow and --force
+

 * ensure that logind sets the syslog facility to AUTH when logging
 
 * when a service has the same env var set twice we actually store it twice and return that in systemctl show -p... We should only show the last setting
 * ensure that logind sets the syslog facility to AUTH when logging
 
 * when a service has the same env var set twice we actually store it twice and return that in systemctl show -p... We should only show the last setting

diff --git a/man/journalctl.xml b/man/journalctl.xml
index c4d2a7e0e8b2921b5b1609da4372c4e295ca2c04..efceefa43ffb3b68ae357baa7d37b47df22d4faa 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -199,6 +199,14 @@
                                 user.</para></listitem>
                         </varlistentry>
 
                                 user.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><option>--local</option></term>
+                                <term><option>-l</option></term>
+
+                                <listitem><para>Show only locally
+                                generated messages.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><option>--new-id128</option></term>
 
                         <varlistentry>
                                 <term><option>--new-id128</option></term>
 

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index f90b2ddabe01ee7b3cdb0b590bee68e4d690af76..01dceca237d7fd20db8884350642b089c822b61a 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -46,6 +46,7 @@ static int arg_lines = -1;
 static bool arg_no_tail = false;
 static bool arg_new_id128 = false;
 static bool arg_quiet = false;
 static bool arg_no_tail = false;
 static bool arg_new_id128 = false;
 static bool arg_quiet = false;

+static bool arg_local = false;

 
 static int help(void) {
 
 
 static int help(void) {
 


@@ -61,7 +62,8 @@ static int help(void) {
                "  -o --output=STRING  Change journal output mode (short, short-monotonic,\n"
                "                      verbose, export, json, cat)\n"
                "  -q --quiet          Don't show privilege warning\n"
                "  -o --output=STRING  Change journal output mode (short, short-monotonic,\n"
                "                      verbose, export, json, cat)\n"
                "  -q --quiet          Don't show privilege warning\n"

-               "     --new-id128      Generate a new 128 Bit id\n",
+               "     --new-id128      Generate a new 128 Bit id\n"
+               "  -l --local          Only local entries\n",

                program_invocation_short_name);
 
         return 0;
                program_invocation_short_name);
 
         return 0;


@@ -87,6 +89,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "no-tail",   no_argument,       NULL, ARG_NO_TAIL   },
                 { "new-id128", no_argument,       NULL, ARG_NEW_ID128 },
                 { "quiet",     no_argument,       NULL, 'q'           },
                 { "no-tail",   no_argument,       NULL, ARG_NO_TAIL   },
                 { "new-id128", no_argument,       NULL, ARG_NEW_ID128 },
                 { "quiet",     no_argument,       NULL, 'q'           },

+                { "local",     no_argument,       NULL, 'l'           },

                 { NULL,        0,                 NULL, 0             }
         };
 
                 { NULL,        0,                 NULL, 0             }
         };
 


@@ -95,7 +98,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
         assert(argc >= 0);
         assert(argv);
 

-        while ((c = getopt_long(argc, argv, "hfo:an:q", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hfo:an:ql", options, NULL)) >= 0) {

 
                 switch (c) {
 
 
                 switch (c) {
 


@@ -150,6 +153,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_quiet = true;
                         break;
 
                         arg_quiet = true;
                         break;
 

+                case 'l':
+                        arg_local = true;
+                        break;
+

                 case '?':
                         return -EINVAL;
 
                 case '?':
                         return -EINVAL;
 


@@ -216,7 +223,7 @@ int main(int argc, char *argv[]) {
                 log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off.");
 #endif
 
                 log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off.");
 #endif
 

-        r = sd_journal_open(&j, 0);
+        r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0);

         if (r < 0) {
                 log_error("Failed to open journal: %s", strerror(-r));
                 goto finish;
         if (r < 0) {
                 log_error("Failed to open journal: %s", strerror(-r));
                 goto finish;