Revert "Revert "crash-reporter: Don't send ps command lines with crash reporter""
This reverts commit 59d8695734dac2ce70b17d2a58049083e65e997d.
My original commit did not actually break anything, so this just puts it back.
BUG=chromium-os:13576
TEST=unit tests, logging_{UserCrash,CrashSender} autotests
Review URL: http://codereview.chromium.org/6765017
Change-Id: I5b9ebb2b210b86fb4efaf49c71dcd2562805c973
diff --git a/crash_reporter/crash_reporter_logs.conf b/crash_reporter/crash_reporter_logs.conf
index 1921983..62c6216 100644
--- a/crash_reporter/crash_reporter_logs.conf
+++ b/crash_reporter/crash_reporter_logs.conf
@@ -19,8 +19,10 @@
# The following rule is used for generating additional diagnostics when
# collection of user crashes fails. This output should not be too large
-# as it is stored in memory.
-crash_reporter-user-collection:echo "===ps output==="; ps auxw | tail -c 25000; echo "===dmesg output==="; dmesg | tail -c 25000; echo "===meminfo==="; cat /proc/meminfo
+# as it is stored in memory. The output format specified for 'ps' is the
+# same as with the "u" ("user-oriented") option, except it doesn't show
+# the commands' arguments (i.e. "comm" instead of "command").
+crash_reporter-user-collection:echo "===ps output==="; ps axw -o user,pid,%cpu,%mem,vsz,rss,tname,stat,start_time,bsdtime,comm | tail -c 25000; echo "===dmesg output==="; dmesg | tail -c 25000; echo "===meminfo==="; cat /proc/meminfo
# The following rules are only for testing purposes.
crash_log_test:echo hello world