Matej Habrnal 0b651c
From eeb63b2105786e63a75cac69311408908c8ecf28 Mon Sep 17 00:00:00 2001
Matej Habrnal 0b651c
From: Gregory Collins <greg@gregorycollins.net>
Matej Habrnal 0b651c
Date: Tue, 20 Jan 2015 18:39:42 -0800
Matej Habrnal 0b651c
Subject: [PATCH] Don't slurp unbounded amounts of data when invoking
Matej Habrnal 0b651c
 journalctl. Fixes #887.
Matej Habrnal 0b651c
Matej Habrnal 0b651c
---
Matej Habrnal 0b651c
 src/plugins/ccpp_event.conf | 4 ++--
Matej Habrnal 0b651c
 1 file changed, 2 insertions(+), 2 deletions(-)
Matej Habrnal 0b651c
Matej Habrnal 0b651c
diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf
Matej Habrnal 0b651c
index 96e7891..985e80d 100644
Matej Habrnal 0b651c
--- a/src/plugins/ccpp_event.conf
Matej Habrnal 0b651c
+++ b/src/plugins/ccpp_event.conf
Matej Habrnal 0b651c
@@ -38,9 +38,9 @@ EVENT=post-create analyzer=CCpp
Matej Habrnal 0b651c
             else
Matej Habrnal 0b651c
                 uid=`cat uid` &&
Matej Habrnal 0b651c
                 log="[System Logs]:\n" &&
Matej Habrnal 0b651c
-                log=$log`journalctl -b --system | grep -F -e "$base_executable" | tail -99` &&
Matej Habrnal 0b651c
+                log=$log`journalctl -b --since=-3m --system | grep -F -e "$base_executable" | tail -99` &&
Matej Habrnal 0b651c
                 log=$log"\n[User Logs]:\n" &&
Matej Habrnal 0b651c
-                log=$log`journalctl _UID="$uid" -b | grep -F -e "$base_executable" | tail -99` &&
Matej Habrnal 0b651c
+                log=$log`journalctl _UID="$uid" -b --since=-3m | grep -F -e "$base_executable" | tail -99` &&
Matej Habrnal 0b651c
                 log=`echo -e "$log"`
Matej Habrnal 0b651c
             fi
Matej Habrnal 0b651c
             if test -n "$log"; then
Matej Habrnal 0b651c
-- 
Matej Habrnal 0b651c
1.9.3
Matej Habrnal 0b651c