picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

journalctl: add --local switch

This commit is contained in:
Lennart Poettering 2012-03-27 00:14:29 +02:00
parent 0aed10889b
commit 2bd3c38a44
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -18,6 +18,8 @@ Bugfixes:
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

8
man/journalctl.xml
View File

@ -199,6 +199,14 @@
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>

13
src/journal/journalctl.c
View File

@ -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_local = false;
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"
" --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;
@ -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' },
{ "local", no_argument, NULL, 'l' },
{ NULL, 0, NULL, 0 }
};
@ -95,7 +98,7 @@ static int parse_argv(int argc, char *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) {
@ -150,6 +153,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_quiet = true;
break;
case 'l':
arg_local = true;
break;
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
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;