summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunhoon Baik <knhoon.baik@samsung.com>2016-06-23 00:47:01 +0900
committerKunhoon Baik <knhoon.baik@samsung.com>2016-06-23 08:58:16 +0900
commita6e0e975c5011a6874f66948c15aa953e1cf5e4e (patch)
tree7a4b4054bb992df687c9735685ce8575df69af03
parent6290148886080d7b1d8b1c56c1da5287f79e2e80 (diff)
downloadcrash-worker-a6e0e975c5011a6874f66948c15aa953e1cf5e4e.tar.gz
crash-worker-a6e0e975c5011a6874f66948c15aa953e1cf5e4e.tar.bz2
crash-worker-a6e0e975c5011a6874f66948c15aa953e1cf5e4e.zip
Make output although some operation fail
Although some operations (like generating callstack) failed during processing crash, The crash output should be generated. Change-Id: I797a5be407aa2a6cf9047fc84a9e28c4985fbcbe
-rw-r--r--src/crash-manager/crash-manager.sh.in9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/crash-manager/crash-manager.sh.in b/src/crash-manager/crash-manager.sh.in
index 49f1536..d99056c 100644
--- a/src/crash-manager/crash-manager.sh.in
+++ b/src/crash-manager/crash-manager.sh.in
@@ -1,6 +1,5 @@
#!/bin/sh
-set -e
exec >/dev/null 2>&1
PATH=/bin:/usr/bin
@@ -17,11 +16,6 @@ time="$5"
cmd="$6"
temp_dir="$(mktemp -d "${CRASH_TEMP}/crash.XXXXXX")"
-cleanup()
-{
- [ "$temp_dir" ] && rm -rf "$temp_dir"
-}
-trap cleanup 0 2 15
name="${cmd}_${pid}_${time}"
result_path="${CRASH_PATH}/${name}.tar.gz"
@@ -44,3 +38,6 @@ dump_systemstate -d -k -f "$log_path" || true
tar czf "${temp_dir}/report.tar.gz" -C "$temp_dir" "$name"
mv "${temp_dir}/report.tar.gz" "$result_path"
+
+[ "$temp_dir" ] && rm -rf "$temp_dir"
+