aboutsummaryrefslogtreecommitdiff
path: root/src/client/mac/sender/uploader.mm
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/mac/sender/uploader.mm')
-rw-r--r--src/client/mac/sender/uploader.mm15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/client/mac/sender/uploader.mm b/src/client/mac/sender/uploader.mm
index b876b9e2..6d4be2d6 100644
--- a/src/client/mac/sender/uploader.mm
+++ b/src/client/mac/sender/uploader.mm
@@ -503,6 +503,11 @@ NSDictionary *readConfigurationData(const char *configFile) {
if (minidumpContents_) {
[upload addFileContents:minidumpContents_ name:@"upload_file_minidump"];
+ // If there is a log file, upload it together with the minidump.
+ if (logFileData_) {
+ [upload addFileContents:logFileData_ name:@"log"];
+ }
+
// Send it
NSError *error = nil;
NSData *data = [upload send:&error];
@@ -543,12 +548,12 @@ NSDictionary *readConfigurationData(const char *configFile) {
reportID );
}
[result release];
+ } else {
+ // Minidump is missing -- upload just the log file.
+ if (logFileData_) {
+ [self uploadData:logFileData_ name:@"log"];
+ }
}
-
- if (logFileData_) {
- [self uploadData:logFileData_ name:@"log"];
- }
-
[upload release];
}