diff options
| author | Oren Hurvitz | 2014-01-29 16:14:27 +0200 |
|---|---|---|
| committer | Oren Hurvitz | 2014-03-25 08:01:55 +0100 |
| commit | e131e73652cf6ed2407e41c7d83dc67f49ca23ee (patch) | |
| tree | e0d8573e47c8edd7f2effca8d4177bc57bd10a26 /OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | |
| parent | Changed LogThreadPool to have 4 logging levels. Added console command "debug ... (diff) | |
| download | opensim-SC_OLD-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.zip opensim-SC_OLD-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.gz opensim-SC_OLD-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.bz2 opensim-SC_OLD-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.xz | |
Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout)
Resolves http://opensimulator.org/mantis/view.php?id=6945
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs index cd95ee9..136a16e 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | |||
| @@ -199,7 +199,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 199 | m_rootScene.AssetService, m_rootScene.UserAccountService, | 199 | m_rootScene.AssetService, m_rootScene.UserAccountService, |
| 200 | m_rootScene.RegionInfo.ScopeID, options, ReceivedAllAssets); | 200 | m_rootScene.RegionInfo.ScopeID, options, ReceivedAllAssets); |
| 201 | 201 | ||
| 202 | Util.FireAndForget(o => ar.Execute()); | 202 | Util.RunThreadNoTimeout(o => ar.Execute(), "AssetsRequest", null); |
| 203 | 203 | ||
| 204 | // CloseArchive() will be called from ReceivedAllAssets() | 204 | // CloseArchive() will be called from ReceivedAllAssets() |
| 205 | } | 205 | } |