diff options
| author | Sean McNamara | 2011-02-25 08:57:48 -0500 |
|---|---|---|
| committer | Sean McNamara | 2011-02-25 08:57:48 -0500 |
| commit | bb1f03abc6a3c12b4f511e4f212f5673c4d31dc4 (patch) | |
| tree | ac2b68c093d24057556f19c6990134d354534c2d /OpenSim | |
| parent | Config works, but timer isn't firing. Hmm. (diff) | |
| download | opensim-SC-bb1f03abc6a3c12b4f511e4f212f5673c4d31dc4.zip opensim-SC-bb1f03abc6a3c12b4f511e4f212f5673c4d31dc4.tar.gz opensim-SC-bb1f03abc6a3c12b4f511e4f212f5673c4d31dc4.tar.bz2 opensim-SC-bb1f03abc6a3c12b4f511e4f212f5673c4d31dc4.tar.xz | |
Make timer auto-respawn.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs index 68c8301..58b93c0 100644 --- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs +++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs | |||
| @@ -275,9 +275,11 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup | |||
| 275 | st.SetEnabled(false); | 275 | st.SetEnabled(false); |
| 276 | return; | 276 | return; |
| 277 | } | 277 | } |
| 278 | st.SetTimer(new Timer(interval)); //Milliseconds -> minutes | 278 | Timer tim = new Timer(interval); |
| 279 | timers.Add(interval, st.GetTimer()); | 279 | st.SetTimer(tim); //Milliseconds -> minutes |
| 280 | st.GetTimer().Elapsed += HandleElapsed; | 280 | timers.Add(interval, tim); |
| 281 | tim.Elapsed += HandleElapsed; | ||
| 282 | tim.AutoReset = True; | ||
| 281 | m_log.Debug("[AUTO BACKUP MODULE]: New timer for " + interval + " msec for region " + sRegionName); | 283 | m_log.Debug("[AUTO BACKUP MODULE]: New timer for " + interval + " msec for region " + sRegionName); |
| 282 | } | 284 | } |
| 283 | 285 | ||
| @@ -351,6 +353,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup | |||
| 351 | { | 353 | { |
| 352 | IRegionArchiverModule iram = scene.RequestModuleInterface<IRegionArchiverModule>(); | 354 | IRegionArchiverModule iram = scene.RequestModuleInterface<IRegionArchiverModule>(); |
| 353 | string savePath = BuildOarPath(scene.RegionInfo.RegionName, state.GetBackupDir(), state.GetNamingType()); | 355 | string savePath = BuildOarPath(scene.RegionInfo.RegionName, state.GetBackupDir(), state.GetNamingType()); |
| 356 | m_log.Debug("[AUTO BACKUP MODULE]: savePath = " + savePath); | ||
| 354 | if(savePath == null) | 357 | if(savePath == null) |
| 355 | { | 358 | { |
| 356 | m_log.Warn("savePath is null in HandleElapsed"); | 359 | m_log.Warn("savePath is null in HandleElapsed"); |