warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for RunUO Crash if Performance tab on Admin gump is open within first 100seconds of server running.

Browse source 
Completion of the DynamicSaveStrategy.  Background saves are now safe; triggered only by the autoSave or command [BackgroundSave ([BGSave)
This commit is contained in:
asayre 2010-12-20 03:34:25 +00:00
parent 0afa707b24
commit 67af95cf0b
12 changed files with 169 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Scripts/Commands/Handlers.cs
View file

@ -48,6 +48,9 @@ namespace Server.Commands
Register( "Help", AccessLevel.Player, new CommandEventHandler( Help_OnCommand ) );
Register( "Save", AccessLevel.Administrator, new CommandEventHandler( Save_OnCommand ) );
Register( "BackgroundSave", AccessLevel.Administrator, new CommandEventHandler( BackgroundSave_OnCommand ) );
Register( "BGSave", AccessLevel.Administrator, new CommandEventHandler( BackgroundSave_OnCommand ) );
Register( "SaveBG", AccessLevel.Administrator, new CommandEventHandler( BackgroundSave_OnCommand ) );
Register( "Move", AccessLevel.GameMaster, new CommandEventHandler( Move_OnCommand ) );
Register( "Client", AccessLevel.Counselor, new CommandEventHandler( Client_OnCommand ) );
@ -55,7 +58,7 @@ namespace Server.Commands
Register( "SMsg", AccessLevel.Counselor, new CommandEventHandler( StaffMessage_OnCommand ) );
Register( "SM", AccessLevel.Counselor, new CommandEventHandler( StaffMessage_OnCommand ) );
Register( "S", AccessLevel.Counselor, new CommandEventHandler( StaffMessage_OnCommand ) );
Register( "BCast", AccessLevel.GameMaster, new CommandEventHandler( BroadcastMessage_OnCommand ) );
Register( "BC", AccessLevel.GameMaster, new CommandEventHandler( BroadcastMessage_OnCommand ) );
Register( "B", AccessLevel.GameMaster, new CommandEventHandler( BroadcastMessage_OnCommand ) );
@ -639,6 +642,14 @@ namespace Server.Commands
Misc.AutoSave.Save();
}
[Usage("BackgroundSave")]
[Aliases("BGSave", "SaveBG")]
[Description("Saves the world, writing to the disk in the background")]
private static void BackgroundSave_OnCommand(CommandEventArgs e)
{
Misc.AutoSave.Save( true );
}
private static bool FixMap( ref Map map, ref Point3D loc, Item item )
{
if ( map == null || map == Map.Internal )

15
Scripts/Misc/AutoSave.cs
View file

@ -52,7 +52,7 @@ namespace Server.Misc
if ( m_Warning == TimeSpan.Zero )
{
Save();
Save( true );
}
else
{
@ -72,14 +72,21 @@ namespace Server.Misc
}
public static void Save()
{
AutoSave.Save( false );
}
public static void Save( bool permitBackgroundWrite )
{
if ( AutoRestart.Restarting )
return;
try{ Backup(); }
catch (Exception e) { Console.WriteLine("WARNING: Automatic backup FAILED: {0}", e); }
World.WaitForWriteCompletion();
World.Save();
try{ Backup(); }
catch ( Exception e ) { Console.WriteLine("WARNING: Automatic backup FAILED: {0}", e); }
World.Save( true, permitBackgroundWrite );
}
private static string[] m_Backups = new string[]

7
Scripts/Misc/CrashGuard.cs
View file

@ -25,11 +25,14 @@ namespace Server.Misc
public static void CrashGuard_OnCrash( CrashedEventArgs e )
{
if ( GenerateReport )
GenerateCrashReport( e );
World.WaitForWriteCompletion();
if ( SaveBackup )
Backup();
if ( GenerateReport )
GenerateCrashReport( e );
/*if ( Core.Service )
e.Close = true;