diff options
author | Justin Clarke Casey | 2008-07-21 17:13:32 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-21 17:13:32 +0000 |
commit | a13a4c61448380852df3fba05d2c88710c28e0a9 (patch) | |
tree | 1a35bb6bf79dba28b99065e36a82a7050203f11b /OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs | |
parent | added support so that the packet tracker can resend packets itself as well as... (diff) | |
download | opensim-SC_OLD-a13a4c61448380852df3fba05d2c88710c28e0a9.zip opensim-SC_OLD-a13a4c61448380852df3fba05d2c88710c28e0a9.tar.gz opensim-SC_OLD-a13a4c61448380852df3fba05d2c88710c28e0a9.tar.bz2 opensim-SC_OLD-a13a4c61448380852df3fba05d2c88710c28e0a9.tar.xz |
* minor: change misleading 'all assets found' message to instead tell how many were actually located
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs index e980650..0341a70 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
44 | /// <summary> | 44 | /// <summary> |
45 | /// Method called when all the necessary assets for an archive request have been received. | 45 | /// Method called when all the necessary assets for an archive request have been received. |
46 | /// </summary> | 46 | /// </summary> |
47 | public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets); | 47 | public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assetsFound, ICollection<LLUUID> assetsNotFoundUuids); |
48 | 48 | ||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Execute the write of an archive once we have received all the necessary data | 50 | /// Execute the write of an archive once we have received all the necessary data |
@@ -73,9 +73,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
73 | m_savePath = savePath; | 73 | m_savePath = savePath; |
74 | } | 74 | } |
75 | 75 | ||
76 | protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets) | 76 | protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assetsFound, ICollection<LLUUID> assetsNotFoundUuids) |
77 | { | 77 | { |
78 | m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count); | 78 | foreach (LLUUID uuid in assetsNotFoundUuids) |
79 | { | ||
80 | m_log.DebugFormat("[ARCHIVER]: Could not find asset {0}", uuid); | ||
81 | } | ||
82 | |||
83 | m_log.InfoFormat( | ||
84 | "[ARCHIVER]: Received {0} of {1} assets requested", assetsFound.Count, assetsFound.Count + assetsNotFoundUuids.Count); | ||
79 | 85 | ||
80 | TarArchiveWriter archive = new TarArchiveWriter(); | 86 | TarArchiveWriter archive = new TarArchiveWriter(); |
81 | 87 | ||
@@ -108,7 +114,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
108 | } | 114 | } |
109 | 115 | ||
110 | // Write out assets | 116 | // Write out assets |
111 | AssetsArchiver assetsArchiver = new AssetsArchiver(assets); | 117 | AssetsArchiver assetsArchiver = new AssetsArchiver(assetsFound); |
112 | assetsArchiver.Archive(archive); | 118 | assetsArchiver.Archive(archive); |
113 | 119 | ||
114 | archive.WriteTar(new GZipStream(new FileStream(m_savePath, FileMode.Create), CompressionMode.Compress)); | 120 | archive.WriteTar(new GZipStream(new FileStream(m_savePath, FileMode.Create), CompressionMode.Compress)); |