summaryrefslogtreecommitdiff
path: root/indra/mac_crash_logger
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2012-12-11 06:56:14 -0800
committerAura Linden <aura@lindenlab.com>2012-12-11 06:56:14 -0800
commit53ea30af06f94b5462fada7c4bfea3122b50ff95 (patch)
tree33c46dcf0195562451b9026b16cab9c9ad97898e /indra/mac_crash_logger
parent2b3bcdbcbb8359220e0026b84b8521197ad0cf50 (diff)
Interim debug checkin to test from teamcity
Diffstat (limited to 'indra/mac_crash_logger')
-rw-r--r--indra/mac_crash_logger/llcrashloggermac.cpp11
-rw-r--r--indra/mac_crash_logger/mac_crash_logger.cpp17
2 files changed, 27 insertions, 1 deletions
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<argc;++x) wlog << "SPATTERS arg " << x << " is '" << argv[x] << "'\n";
app.parseCommandOptions(argc, argv);
+ wlog << "SPATTERS parsed commands.!\n";
if (! app.init())
{
+ wlog << "SPATTERS failed to init.!\n";
+
llwarns << "Unable to initialize application." << llendl;
return 1;
}
if (app.getCrashBehavior() != CRASH_BEHAVIOR_ALWAYS_SEND)
{
+ wlog << "SPATTERS wanted to dialog.!\n";
+
// return NSApplicationMain(argc, (const char **)argv);
}
+ wlog << "SPATTERS starting mainloop.!\n";
+
app.mainLoop();
+ wlog << "SPATTERS finished main.!\n";
+
app.cleanup();
+ wlog << "SPATTERS finished cleanup.!\n";
+
llinfos << "Crash reporter finished normally." << llendl;
+ wlog.close();
return 0;
}