aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices/OpenGridServices.AssetServer/Main.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-06-05 13:18:44 +0000
committerAdam Frisby2007-06-05 13:18:44 +0000
commit75f9b25b41b5a80025e17808b5b2d9fe7295d54e (patch)
treecd96e948447cc9a030c7ce537d25da06ea40db5e /OpenGridServices/OpenGridServices.AssetServer/Main.cs
parent* "We are" message is now a status text message. (diff)
downloadopensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.zip
opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.gz
opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.bz2
opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.xz
* Fixed OGS build
* Converted to new console interfaces * Fixed other minor issues which somehow snuck in
Diffstat (limited to '')
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/Main.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
index 334d3c5..de76645 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
@@ -72,7 +72,7 @@ namespace OpenGridServices.AssetServer
72 72
73 private void Work() 73 private void Work()
74 { 74 {
75 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "\nEnter help for a list of commands\n"); 75 m_console.Notice("Enter help for a list of commands");
76 76
77 while (true) 77 while (true)
78 { 78 {
@@ -88,10 +88,10 @@ namespace OpenGridServices.AssetServer
88 88
89 public void Startup() 89 public void Startup()
90 { 90 {
91 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Setting up asset DB"); 91 m_console.Verbose( "Main.cs:Startup() - Setting up asset DB");
92 setupDB(); 92 setupDB();
93 93
94 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP process"); 94 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
95 AssetHttpServer httpServer = new AssetHttpServer(8003); 95 AssetHttpServer httpServer = new AssetHttpServer(8003);
96 96
97 97
@@ -121,7 +121,7 @@ namespace OpenGridServices.AssetServer
121 121
122 public string assetGetMethod(string request, string path, string param) 122 public string assetGetMethod(string request, string path, string param)
123 { 123 {
124 Console.WriteLine("got a request " +param); 124 Console.WriteLine("got a request " + param);
125 byte[] assetdata = getAssetData(new LLUUID(param), false); 125 byte[] assetdata = getAssetData(new LLUUID(param), false);
126 if (assetdata != null) 126 if (assetdata != null)
127 { 127 {
@@ -167,13 +167,13 @@ namespace OpenGridServices.AssetServer
167 try 167 try
168 { 168 {
169 db = Db4oFactory.OpenFile("assets.yap"); 169 db = Db4oFactory.OpenFile("assets.yap");
170 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:setupDB() - creation"); 170 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Main.cs:setupDB() - creation");
171 } 171 }
172 catch (Exception e) 172 catch (Exception e)
173 { 173 {
174 db.Close(); 174 db.Close();
175 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs:setupDB() - Exception occured"); 175 OpenSim.Framework.Console.MainConsole.Instance.Warn("Main.cs:setupDB() - Exception occured");
176 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString()); 176 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
177 } 177 }
178 if (!yapfile) 178 if (!yapfile)
179 { 179 {
@@ -322,7 +322,7 @@ namespace OpenGridServices.AssetServer
322 switch (cmd) 322 switch (cmd)
323 { 323 {
324 case "help": 324 case "help":
325 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - shutdown this asset server (USE CAUTION!)"); 325 m_console.Notice("shutdown - shutdown this asset server (USE CAUTION!)");
326 break; 326 break;
327 327
328 case "shutdown": 328 case "shutdown":