From 44d511669ba85a0311dc8d0901f22a1f38c0790b Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Mon, 12 Nov 2012 16:25:09 -0800 Subject: Pulled cocoa crash reporter changes from old branch. --- indra/mac_crash_logger/mac_crash_logger.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'indra/mac_crash_logger/mac_crash_logger.cpp') diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 6571b35241..4d0a7af27f 100644 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -26,9 +26,18 @@ #include "linden_common.h" #include "llcrashloggermac.h" +#include "indra_constants.h" +#include +#include + + int main(int argc, char **argv) { + std::ofstream outputFile; + outputFile.open("/tmp/aura.txt"); + outputFile << "TEstiNG" << std::endl; + llinfos << "SPATTERS ASDFSDFSDF" << llendl; llinfos << "Starting crash reporter." << llendl; LLCrashLoggerMac app; @@ -39,9 +48,16 @@ int main(int argc, char **argv) llwarns << "Unable to initialize application." << llendl; return 1; } - + if (app.getCrashBehavior() != CRASH_BEHAVIOR_ALWAYS_SEND) + { + +// return NSApplicationMain(argc, (const char **)argv); + } app.mainLoop(); app.cleanup(); llinfos << "Crash reporter finished normally." << llendl; + + outputFile.close(); + return 0; } -- cgit v1.3 From 1149c94c5b5008f6c076ce4b072f54e48c4783ae Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Thu, 29 Nov 2012 23:33:31 -0800 Subject: Crashlogger only runs when it comes from teamcity so I must checkin debug and wait. What fun. --- indra/llcrashlogger/llcrashlogger.cpp | 2 +- indra/llvfs/lldir.cpp | 3 ++- indra/mac_crash_logger/mac_crash_logger.cpp | 8 -------- 3 files changed, 3 insertions(+), 10 deletions(-) (limited to 'indra/mac_crash_logger/mac_crash_logger.cpp') diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index d6dcde4b9f..7ecb34eaf6 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -384,7 +384,7 @@ bool LLCrashLogger::init() LLCurl::initClass(false); // We assume that all the logs we're looking for reside on the current drive - gDirUtilp->initAppDirs("SecondLife"); + gDirUtilp->initAppDirs("com.secondlife.indra.viewer"); LLError::initForApplication(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "")); diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 32d081d552..bd5ce4acac 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -431,6 +431,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd llassert(0); } + llinfos << "SPATTERS got " << prefix << " for location " << location << llendl; std::string filename = in_filename; if (!subdir2.empty()) { @@ -471,7 +472,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd expanded_filename.assign(""); } - //llinfos << "*** EXPANDED FILENAME: <" << expanded_filename << ">" << llendl; + llinfos << "*** EXPANDED FILENAME: <" << expanded_filename << ">" << llendl; return expanded_filename; } diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 4d0a7af27f..5e6806c08e 100644 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -34,12 +34,6 @@ int main(int argc, char **argv) { - std::ofstream outputFile; - outputFile.open("/tmp/aura.txt"); - outputFile << "TEstiNG" << std::endl; - llinfos << "SPATTERS ASDFSDFSDF" << llendl; - llinfos << "Starting crash reporter." << llendl; - LLCrashLoggerMac app; app.parseCommandOptions(argc, argv); @@ -57,7 +51,5 @@ int main(int argc, char **argv) app.cleanup(); llinfos << "Crash reporter finished normally." << llendl; - outputFile.close(); - return 0; } -- cgit v1.3 From 53ea30af06f94b5462fada7c4bfea3122b50ff95 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 11 Dec 2012 06:56:14 -0800 Subject: Interim debug checkin to test from teamcity --- indra/llcrashlogger/llcrashlogger.cpp | 13 ++++++++++++- indra/llvfs/llvfs_objc.mm | 9 +++++---- indra/mac_crash_logger/llcrashloggermac.cpp | 11 ++++++++++- indra/mac_crash_logger/mac_crash_logger.cpp | 17 +++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) (limited to 'indra/mac_crash_logger/mac_crash_logger.cpp') diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 7ecb34eaf6..008b0e04b5 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -339,6 +339,10 @@ bool LLCrashLogger::runCrashLogPost(std::string host, LLSD data, std::string msg bool LLCrashLogger::sendCrashLogs() { + std::ofstream wlog; + wlog.open("/Users/samantha/crashlogging2.txt"); + wlog << "SPATTERS sendingCrashLogs.!\n"; + gatherFiles(); LLSD post_data; @@ -350,6 +354,7 @@ bool LLCrashLogger::sendCrashLogs() "SecondLifeCrashReport"); std::string report_file = dump_path + ".log"; + wlog << "SPATTERS looking in dump_path " << dump_path << " report_file " << report_file << "\n"; std::ofstream out_file(report_file.c_str()); LLSDSerialize::toPrettyXML(post_data, out_file); out_file.close(); @@ -359,14 +364,18 @@ bool LLCrashLogger::sendCrashLogs() //*TODO: Translate if(mCrashHost != "") { + wlog << "SPATTERS sending to MAIN host " << mCrashHost << "\n"; sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), 3, 5); } if(!sent) { + wlog << "SPATTERS sending to MAIN host " << mAltCrashHost << "\n"; sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to alternate server"), 3, 5); } + wlog.close(); + mSentCrashLogs = sent; return true; @@ -384,7 +393,7 @@ bool LLCrashLogger::init() LLCurl::initClass(false); // We assume that all the logs we're looking for reside on the current drive - gDirUtilp->initAppDirs("com.secondlife.indra.viewer"); + gDirUtilp->initAppDirs("SecondLife"); LLError::initForApplication(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "")); @@ -394,6 +403,7 @@ bool LLCrashLogger::init() // Rename current log file to ".old" std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log.old"); std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log"); + llinfos << "SPATTERS moving " << log_file << " to " << old_log_file <prime(gAPRPoolp); LLHTTPClient::setPump(*gServicePump); diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm index 4d7cd3a93e..61cfad99d6 100644 --- a/indra/llvfs/llvfs_objc.mm +++ b/indra/llvfs/llvfs_objc.mm @@ -51,10 +51,10 @@ std::string* findSystemDirectory(NSSearchPathDirectory searchPathDirectory, YES); if ([paths count]) { - NSString *bundleName = - [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"]; - path = [[paths objectAtIndex:0] stringByAppendingPathComponent:bundleName]; - + //NSString *bundleName = @"SecondLife"; + //[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"]; + //path = [[paths objectAtIndex:0] stringByAppendingPathComponent:bundleName]; + path = [paths objectAtIndex:0]; //SPATTERS HACK: Always attempt to create directory, ignore errors. NSError *error = nil; @@ -88,6 +88,7 @@ std::string* getSystemApplicationSupportFolder() { return findSystemDirectory (NSApplicationSupportDirectory, NSUserDomainMask); + } #endif // LL_DARWIN diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp index 5d22b60136..64064d9cee 100644 --- a/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/indra/mac_crash_logger/llcrashloggermac.cpp @@ -66,22 +66,31 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles() bool LLCrashLoggerMac::mainLoop() { + std::ofstream wlog; + wlog.open("/Users/samantha/crashlogging1.txt"); + wlog << "SPATTERS mainloop.!\n"; + if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND) { + wlog << "sending\n"; gSendReport = true; } if(gRememberChoice) { + wlog << "momento\n"; if(gSendReport) saveCrashBehaviorSetting(CRASH_BEHAVIOR_ALWAYS_SEND); else saveCrashBehaviorSetting(CRASH_BEHAVIOR_NEVER_SEND); } if(gSendReport) { + wlog << "Send report!"; setUserText(gUserNotes); sendCrashLogs(); - } + } + + wlog.close(); return true; } diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 5e6806c08e..0d4f2855c7 100644 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -34,22 +34,39 @@ int main(int argc, char **argv) { + std::ofstream wlog; + wlog.open("/Users/samantha/crashlogging.txt"); + wlog << "SPATTERS starting crash reporter.!\n"; LLCrashLoggerMac app; + wlog << "SPATTERS created app instance.!\n"; + for (int x=0;x Date: Tue, 11 Dec 2012 07:40:26 -0800 Subject: Crash reporter fixed, debugging removed. --- indra/llcrashlogger/llcrashlogger.cpp | 13 +------------ indra/llvfs/llvfs_objc.mm | 3 --- indra/mac_crash_logger/llcrashloggermac.cpp | 11 +---------- indra/mac_crash_logger/mac_crash_logger.cpp | 17 ----------------- 4 files changed, 2 insertions(+), 42 deletions(-) (limited to 'indra/mac_crash_logger/mac_crash_logger.cpp') diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 008b0e04b5..34e25a8a71 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -339,10 +339,6 @@ bool LLCrashLogger::runCrashLogPost(std::string host, LLSD data, std::string msg bool LLCrashLogger::sendCrashLogs() { - std::ofstream wlog; - wlog.open("/Users/samantha/crashlogging2.txt"); - wlog << "SPATTERS sendingCrashLogs.!\n"; - gatherFiles(); LLSD post_data; @@ -354,7 +350,6 @@ bool LLCrashLogger::sendCrashLogs() "SecondLifeCrashReport"); std::string report_file = dump_path + ".log"; - wlog << "SPATTERS looking in dump_path " << dump_path << " report_file " << report_file << "\n"; std::ofstream out_file(report_file.c_str()); LLSDSerialize::toPrettyXML(post_data, out_file); out_file.close(); @@ -364,18 +359,14 @@ bool LLCrashLogger::sendCrashLogs() //*TODO: Translate if(mCrashHost != "") { - wlog << "SPATTERS sending to MAIN host " << mCrashHost << "\n"; sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), 3, 5); } if(!sent) { - wlog << "SPATTERS sending to MAIN host " << mAltCrashHost << "\n"; sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to alternate server"), 3, 5); } - - wlog.close(); - + mSentCrashLogs = sent; return true; @@ -403,7 +394,6 @@ bool LLCrashLogger::init() // Rename current log file to ".old" std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log.old"); std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log"); - llinfos << "SPATTERS moving " << log_file << " to " << old_log_file <prime(gAPRPoolp); LLHTTPClient::setPump(*gServicePump); diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm index 61cfad99d6..16cfefda26 100644 --- a/indra/llvfs/llvfs_objc.mm +++ b/indra/llvfs/llvfs_objc.mm @@ -51,9 +51,6 @@ std::string* findSystemDirectory(NSSearchPathDirectory searchPathDirectory, YES); if ([paths count]) { - //NSString *bundleName = @"SecondLife"; - //[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"]; - //path = [[paths objectAtIndex:0] stringByAppendingPathComponent:bundleName]; path = [paths objectAtIndex:0]; //SPATTERS HACK: Always attempt to create directory, ignore errors. NSError *error = nil; diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp index 64064d9cee..c5f660ca6e 100644 --- a/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/indra/mac_crash_logger/llcrashloggermac.cpp @@ -66,32 +66,23 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles() bool LLCrashLoggerMac::mainLoop() { - std::ofstream wlog; - wlog.open("/Users/samantha/crashlogging1.txt"); - wlog << "SPATTERS mainloop.!\n"; - if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND) { - wlog << "sending\n"; gSendReport = true; } if(gRememberChoice) { - wlog << "momento\n"; if(gSendReport) saveCrashBehaviorSetting(CRASH_BEHAVIOR_ALWAYS_SEND); else saveCrashBehaviorSetting(CRASH_BEHAVIOR_NEVER_SEND); } if(gSendReport) { - wlog << "Send report!"; setUserText(gUserNotes); sendCrashLogs(); } - - wlog.close(); - + return true; } diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 0d4f2855c7..6add74556f 100644 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -29,44 +29,27 @@ #include "indra_constants.h" #include -#include - int main(int argc, char **argv) { - std::ofstream wlog; - wlog.open("/Users/samantha/crashlogging.txt"); - wlog << "SPATTERS starting crash reporter.!\n"; LLCrashLoggerMac app; - wlog << "SPATTERS created app instance.!\n"; - for (int x=0;x