AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 04:32:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Heartbeat is now a background task

Browse Source
This commit is contained in:
UnknownShadow200 2017-05-26 10:00:16 +10:00
parent f5061dec9d
commit 5c697efc36
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
MCGalaxy/Network/Heartbeat/Heartbeat.cs
View File

@ -22,6 +22,7 @@ using System.Net;
using System.Net.Cache;
using System.Text;
using System.Threading;
using MCGalaxy.Tasks;
namespace MCGalaxy.Network {
@ -60,12 +61,23 @@ namespace MCGalaxy.Network {
using (File.Create("heartbeat.log")) { }
}
canBeat = true;
for (int i = 0; i < Beats.Length; i++) {
Beats[i].Init();
Pump(Beats[i]);
foreach (Heartbeat beat in Heartbeats) {
beat.Init();
Pump(beat);
}
if (heartbeatTask != null) return;
heartbeatTask = Server.Background.QueueRepeat(OnBeat, null,
TimeSpan.FromSeconds(30));
}
static SchedulerTask heartbeatTask;
static void OnBeat(SchedulerTask task) {
foreach (Heartbeat beat in Heartbeats) {
if (beat.Persistent) Pump(beat);
}
}
/// <summary> Pumps the specified heartbeat. </summary>
public static void Pump(Heartbeat beat) {
@ -105,21 +117,5 @@ namespace MCGalaxy.Network {
if (Server.logbeat) Server.s.Log("Beat: " + beat + " failed.");
}
static Timer timer;
static bool canBeat = false;
readonly static Heartbeat[] Beats = new Heartbeat[] { new ClassiCubeBeat() };
static Heartbeat() {
timer = new Timer(OnBeat, null, 30000, 30000);
}
static void OnBeat(object state) {
if (!canBeat) return;
for (int i = 0; i < Beats.Length; i++) {
if (Beats[i].Persistent) Pump(Beats[i]);
}
}
}
}

2
MCGalaxy/Server/Server.cs
View File

@ -162,8 +162,6 @@ namespace MCGalaxy {
Ban.EnsureExists();
if (!Directory.Exists("extra")) Directory.CreateDirectory("extra");
if (!Directory.Exists("extra/copy/")) Directory.CreateDirectory("extra/copy/");
if (!Directory.Exists("extra/copyBackup/")) Directory.CreateDirectory("extra/copyBackup/");
if (!Directory.Exists("extra/Waypoints")) Directory.CreateDirectory("extra/Waypoints");
if (!Directory.Exists("blockdefs")) Directory.CreateDirectory("blockdefs");
}