aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-28 17:54:12 +0000
committerJustin Clarke Casey2008-05-28 17:54:12 +0000
commit45b26d45400f0df8c8a9991290ef712a37f25fd1 (patch)
tree1e979af7439ea0315df4dc962021a2f7f6a96331
parent* Put in stubs for "load-oar" command, including ultra-primitive temporary ta... (diff)
downloadopensim-SC_OLD-45b26d45400f0df8c8a9991290ef712a37f25fd1.zip
opensim-SC_OLD-45b26d45400f0df8c8a9991290ef712a37f25fd1.tar.gz
opensim-SC_OLD-45b26d45400f0df8c8a9991290ef712a37f25fd1.tar.bz2
opensim-SC_OLD-45b26d45400f0df8c8a9991290ef712a37f25fd1.tar.xz
* Minor: Log message clean up in archiver code
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs6
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
index b952200..576286d 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
@@ -121,6 +121,8 @@ namespace OpenSim.Region.Environment
121 } 121 }
122 122
123 archive.WriteTar(m_savePath); 123 archive.WriteTar(m_savePath);
124
125 m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
124 } 126 }
125 127
126 /// <summary> 128 /// <summary>
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs
index e951755..1301eb3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Environment
113 113
114 // file size in bytes (12) 114 // file size in bytes (12)
115 int fileSize = data.Length; 115 int fileSize = data.Length;
116 m_log.DebugFormat("[TAR ARCHIVE]: File size of {0} is {1}", filePath, fileSize); 116 m_log.DebugFormat("[TAR ARCHIVE WRITER]: File size of {0} is {1}", filePath, fileSize);
117 117
118 byte[] fileSizeBytes = ConvertDecimalToPaddedOctalBytes(fileSize, 11); 118 byte[] fileSizeBytes = ConvertDecimalToPaddedOctalBytes(fileSize, 11);
119 119
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment
146 checksum += b; 146 checksum += b;
147 } 147 }
148 148
149 m_log.DebugFormat("[TAR ARCHIVE]: Decimal header checksum is {0}", checksum); 149 m_log.DebugFormat("[TAR ARCHIVE WRITER]: Decimal header checksum is {0}", checksum);
150 150
151 byte[] checkSumBytes = ConvertDecimalToPaddedOctalBytes(checksum, 6); 151 byte[] checkSumBytes = ConvertDecimalToPaddedOctalBytes(checksum, 6);
152 //byte[] checkSumBytes = m_asciiEncoding.GetBytes("007520"); 152 //byte[] checkSumBytes = m_asciiEncoding.GetBytes("007520");
@@ -165,7 +165,7 @@ namespace OpenSim.Region.Environment
165 { 165 {
166 int paddingRequired = 512 - (data.Length % 512); 166 int paddingRequired = 512 - (data.Length % 512);
167 167
168 m_log.DebugFormat("Padding data with {0} bytes", paddingRequired); 168 m_log.DebugFormat("[TAR ARCHIVE WRITER]: Padding data with {0} bytes", paddingRequired);
169 169
170 byte[] padding = new byte[paddingRequired]; 170 byte[] padding = new byte[paddingRequired];
171 bw.Write(padding); 171 bw.Write(padding);