scripts: Fix shim log checking for data collection script

The "cc-collect-data.sh" script was incorrectly assuming `cc-shim` was a systemd unit. Fixed to check by identifier for the shim. Fixes #681. Signed-off-by: James O. D. Hunt <[email protected]>
clearcontainers · Oct 6, 2017 · 80557b3 · 80557b3
1 parent e415817
commit 80557b3
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/data/cc-collect-data.sh.in b/data/cc-collect-data.sh.in
@@ -200,12 +200,23 @@ show_runtime_log_details()
 
 find_system_journal_problems()
 {
-	name="$1"
-	program="$2"
+	local name="$1"
+	local program="$2"
+	local unit="$3"
+
+	local selector
 
 	data_source="system journal"
 
-	local problems=$(journalctl -q -o cat -au "$program" |\
+	if [ -n "$unit" ]; then
+		# select by systemd unit
+		selector='-u'
+	else
+		# select by identifier
+		selector='-t'
+	fi
+
+	local problems=$(journalctl -q -o cat -a "$selector" "$program" |\
 		grep "time=" |\
 		egrep -i "$problem_pattern" |\
 		tail -n ${PROBLEM_LIMIT})
@@ -222,14 +233,14 @@ show_proxy_log_details()
 {
 	subheading "Proxy logs"
 
-	find_system_journal_problems "proxy" "cc-proxy"
+	find_system_journal_problems "proxy" "cc-proxy" "unit"
 }
 
 show_shim_log_details()
 {
 	subheading "Shim logs"
 
-	find_system_journal_problems "shim" "cc-shim"
+	find_system_journal_problems "shim" "cc-shim" ""
 }
 
 show_package_versions()