Index: components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java |
diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java |
index 28eaa068d84d510a38280a263cea3ddec2ccb6be..2c0ac290b9be0b2bfb60ae5a6dadf10bbfa0e9e6 100644 |
--- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java |
+++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java |
@@ -48,7 +48,7 @@ public class MinidumpUploaderImpl implements MinidumpUploader { |
@VisibleForTesting |
public MinidumpUploaderImpl(MinidumpUploaderDelegate delegate) { |
mDelegate = delegate; |
- mFileManager = createCrashFileManager(mDelegate.createCrashDir()); |
+ mFileManager = createCrashFileManager(mDelegate.getCacheDir()); |
if (!mFileManager.ensureCrashDirExists()) { |
Log.e(TAG, "Crash directory doesn't exist!"); |
} |
@@ -56,11 +56,12 @@ public class MinidumpUploaderImpl implements MinidumpUploader { |
/** |
* Utility method to allow tests to customize the behavior of the crash file manager. |
- * @param {crashDir} The directory in which to store crash files (i.e. minidumps). |
+ * @param {cacheDir} The cache directory, which contains the crash directory, in which crash |
+ * files (i.e. minidumps) are stored. |
*/ |
@VisibleForTesting |
- public CrashFileManager createCrashFileManager(File crashDir) { |
- return new CrashFileManager(crashDir); |
+ public CrashFileManager createCrashFileManager(File cacheDir) { |
+ return new CrashFileManager(cacheDir); |
} |
/** |
@@ -88,7 +89,9 @@ public class MinidumpUploaderImpl implements MinidumpUploader { |
@Override |
public void run() { |
File[] minidumps = mFileManager.getAllMinidumpFiles(MAX_UPLOAD_TRIES_ALLOWED); |
+ Log.i(TAG, "Attempting to upload %d minidumps ", minidumps.length); |
for (File minidump : minidumps) { |
+ Log.i(TAG, "Attempting to upload " + minidump.getName()); |
MinidumpUploadCallable uploadCallable = createMinidumpUploadCallable( |
minidump, mFileManager.getCrashUploadLogFile()); |
int uploadResult = uploadCallable.call(); |
@@ -116,6 +119,8 @@ public class MinidumpUploaderImpl implements MinidumpUploader { |
Log.w(TAG, "Failed to increment attempt number of " + minidump); |
} |
} |
+ |
+ // TODO(isherman): Log success/failure metrics for Chrome. |
Ilya Sherman
2017/03/13 03:12:09
I'm actually not sure how to do this. The upload
gsennton
2017/03/13 17:57:17
Sounds reasonable (but I don't know much about UMA
Ilya Sherman
2017/03/14 02:18:55
Actually, now that I realize that it's okay to use
gsennton
2017/03/14 18:17:28
It's fine as long as we do it just from the browse
|
} |
// Clean out old/uploaded minidumps. Note that this clean-up method is more strict than |