Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs =================================================================== diff -u -r03ef89eb3f342ecbecb600875fbc1081182ddbd1 -r45607cccad23ec38561120539e1109e69a9e82cb --- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 03ef89eb3f342ecbecb600875fbc1081182ddbd1) +++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 45607cccad23ec38561120539e1109e69a9e82cb) @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.Configuration; using System.Diagnostics; +using System.DirectoryServices.AccountManagement; using System.Globalization; using System.IO; using System.Linq; @@ -54,6 +55,7 @@ using Ringtoets.StabilityPointStructures.Plugin; using Ringtoets.StabilityStoneCover.Plugin; using Ringtoets.WaveImpactAsphaltCover.Plugin; +using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; using MessageBox = System.Windows.MessageBox; #if INCLUDE_DEMOPROJECT using Demo.Ringtoets.GUIs; @@ -83,7 +85,11 @@ { SetLanguage(); - log.Info(string.Format(Core.Common.Gui.Properties.Resources.App_Starting_Ringtoets_version_0, SettingsHelper.ApplicationVersion)); + var userDisplay = UserDisplay(); + + log.Info(string.Format(CoreCommonGuiResources.App_Starting_Ringtoets_version_0_by_user_0, + SettingsHelper.ApplicationVersion, + userDisplay)); } private delegate void ExceptionDelegate(Exception exception, bool isTerminating); @@ -219,7 +225,7 @@ { if (!AcquireSingleInstancePerUserMutex()) { - MessageBox.Show(Core.Common.Gui.Properties.Resources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets_Please_close_the_other_instance_first); + MessageBox.Show(CoreCommonGuiResources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets_Please_close_the_other_instance_first); Shutdown(1); return true; //done here } @@ -283,7 +289,7 @@ private static void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) { - Exception exception = e.ExceptionObject as Exception ?? new Exception(Core.Common.Gui.Properties.Resources.App_AppDomain_UnhandledException_Unknown_exception_); + Exception exception = e.ExceptionObject as Exception ?? new Exception(CoreCommonGuiResources.App_AppDomain_UnhandledException_Unknown_exception_); HandleExceptionOnMainThread(exception, e.IsTerminating); } @@ -391,6 +397,11 @@ } } + private static string UserDisplay() + { + return string.Format("{0} ({1})", UserPrincipal.Current.DisplayName, UserPrincipal.Current.SamAccountName); + } + private static string GetLogFileDirectory() { var fileAppender = LogManager.GetAllRepositories()