nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revise RayGun registration

Browse source
This commit is contained in:
John Lewin 2018-02-01 12:10:03 -08:00
parent c979523bd8
commit ec334f91cb
1 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Program.cs
View file

@ -15,7 +15,7 @@ namespace MatterHackers.MatterControl
private static int raygunNotificationCount = 0; private static int raygunNotificationCount = 0;
private static RaygunClient _raygunClient = GetCorrectClient(); private static RaygunClient _raygunClient;
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.
@ -31,6 +31,15 @@ namespace MatterHackers.MatterControl
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
if (AggContext.OperatingSystem == OSType.Mac)
{
_raygunClient = new RaygunClient("qmMBpKy3OSTJj83+tkO7BQ=="); // this is the Mac key
}
else
{
_raygunClient = new RaygunClient("hQIlyUUZRGPyXVXbI6l1dA=="); // this is the PC key
}
AggContext.Init(embeddedResourceName: "config.json"); AggContext.Init(embeddedResourceName: "config.json");
// Make sure we have the right working directory as we assume everything relative to the executable. // Make sure we have the right working directory as we assume everything relative to the executable.
@ -44,8 +53,21 @@ namespace MatterHackers.MatterControl
if (string.IsNullOrEmpty(channel) || channel != "release" || OemSettings.Instance.WindowTitleExtra == "Experimental") if (string.IsNullOrEmpty(channel) || channel != "release" || OemSettings.Instance.WindowTitleExtra == "Experimental")
#endif #endif
{ {
System.Windows.Forms.Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); System.Windows.Forms.Application.ThreadException += (s, e) =>
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); {
if(raygunNotificationCount++ < RaygunMaxNotifications)
{
_raygunClient.Send(e.Exception);
}
};
AppDomain.CurrentDomain.UnhandledException += (s, e) =>
{
if (raygunNotificationCount++ < RaygunMaxNotifications)
{
_raygunClient.Send(e.ExceptionObject as Exception);
}
};
} }
// Get startup bounds from MatterControl and construct system window // Get startup bounds from MatterControl and construct system window
@ -56,38 +78,6 @@ namespace MatterHackers.MatterControl
systemWindow.ShowAsSystemWindow(); systemWindow.ShowAsSystemWindow();
} }
private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
{
#if !DEBUG
if(raygunNotificationCount++ < RaygunMaxNotifications)
{
_raygunClient.Send(e.Exception);
}
#endif
}
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
#if !DEBUG
if(raygunNotificationCount++ < RaygunMaxNotifications)
{
_raygunClient.Send(e.ExceptionObject as Exception);
}
#endif
}
private static RaygunClient GetCorrectClient()
{
if (AggContext.OperatingSystem == OSType.Mac)
{
return new RaygunClient("qmMBpKy3OSTJj83+tkO7BQ=="); // this is the Mac key
}
else
{
return new RaygunClient("hQIlyUUZRGPyXVXbI6l1dA=="); // this is the PC key
}
}
// ** Standard Winforms Main ** // // ** Standard Winforms Main ** //
//[STAThread] //[STAThread]
//static void Main() //static void Main()