diff options
author | Adam Frisby | 2007-10-22 21:57:32 +0000 |
---|---|---|
committer | Adam Frisby | 2007-10-22 21:57:32 +0000 |
commit | 5dad0ed7296b4abfe2c934a8404022a4d2189051 (patch) | |
tree | a1151b7ba2e093e947034b40ad10b8614137cf05 /OpenSim/Framework/Communications/Cache | |
parent | * Made EstateSetting static since there's only one instance, and we only need... (diff) | |
download | opensim-SC-5dad0ed7296b4abfe2c934a8404022a4d2189051.zip opensim-SC-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.gz opensim-SC-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.bz2 opensim-SC-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.xz |
* Return of R2162. /Take that SVN!/
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 17829b2..9dbd50e 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
72 | /// </summary> | 72 | /// </summary> |
73 | public AssetCache(IAssetServer assetServer) | 73 | public AssetCache(IAssetServer assetServer) |
74 | { | 74 | { |
75 | System.Console.WriteLine("Creating Asset cache"); | 75 | OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE","Creating Asset cache"); |
76 | _assetServer = assetServer; | 76 | _assetServer = assetServer; |
77 | _assetServer.SetReceiver(this); | 77 | _assetServer.SetReceiver(this); |
78 | Assets = new Dictionary<LLUUID, AssetInfo>(); | 78 | Assets = new Dictionary<LLUUID, AssetInfo>(); |
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
89 | 89 | ||
90 | public AssetCache(string assetServerDLLName, string assetServerURL, string assetServerKey) | 90 | public AssetCache(string assetServerDLLName, string assetServerURL, string assetServerKey) |
91 | { | 91 | { |
92 | System.Console.WriteLine("Creating Asset cache"); | 92 | OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE", "Creating Asset cache"); |
93 | _assetServer = this.LoadAssetDll(assetServerDLLName); | 93 | _assetServer = this.LoadAssetDll(assetServerDLLName); |
94 | 94 | ||
95 | 95 | ||
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs index 22bdc5c..aebda00 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
51 | yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap")); | 51 | yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap")); |
52 | 52 | ||
53 | db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap")); | 53 | db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap")); |
54 | MainLog.Instance.Verbose("Db4 Asset database creation"); | 54 | MainLog.Instance.Verbose("ASSETS","Db4 Asset database creation"); |
55 | 55 | ||
56 | if (!yapfile) | 56 | if (!yapfile) |
57 | { | 57 | { |
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
75 | 75 | ||
76 | if (db != null) | 76 | if (db != null) |
77 | { | 77 | { |
78 | MainLog.Instance.Verbose("Closing local asset server database"); | 78 | MainLog.Instance.Verbose("ASSETSERVER","Closing local asset server database"); |
79 | db.Close(); | 79 | db.Close(); |
80 | } | 80 | } |
81 | } | 81 | } |
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 08d5b87..a3ec346 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
37 | 37 | ||
38 | public AssetServerBase() | 38 | public AssetServerBase() |
39 | { | 39 | { |
40 | System.Console.WriteLine("Starting Db4o asset storage system"); | 40 | OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting Db4o asset storage system"); |
41 | this._assetRequests = new BlockingQueue<ARequest>(); | 41 | this._assetRequests = new BlockingQueue<ARequest>(); |
42 | 42 | ||
43 | this._localAssetServerThread = new Thread( RunRequests ); | 43 | this._localAssetServerThread = new Thread( RunRequests ); |
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 69f83d2..580e5c4 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
68 | m_assetProviderPlugin = plug; | 68 | m_assetProviderPlugin = plug; |
69 | m_assetProviderPlugin.Initialise(); | 69 | m_assetProviderPlugin.Initialise(); |
70 | 70 | ||
71 | MainLog.Instance.Verbose("AssetStorage: Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version); | 71 | MainLog.Instance.Verbose("AssetStorage","Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version); |
72 | } | 72 | } |
73 | 73 | ||
74 | typeInterface = null; | 74 | typeInterface = null; |
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
92 | { | 92 | { |
93 | ARequest req = this._assetRequests.Dequeue(); | 93 | ARequest req = this._assetRequests.Dequeue(); |
94 | 94 | ||
95 | MainLog.Instance.Verbose("Requesting asset: " + req.AssetID); | 95 | MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID); |
96 | 96 | ||
97 | AssetBase asset = null; | 97 | AssetBase asset = null; |
98 | lock (syncLock) | 98 | lock (syncLock) |