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