- change AssetInventoryServer config from XML to INI

- convert AssetInventoryServer logging to OpenSim's log4net
- updated AssetInventoryServer.ini.example file

1 files changed, 9 insertions, 12 deletions

diff --git a/OpenSim/Grid/AssetInventoryServer/Main.cs b/OpenSim/Grid/AssetInventoryServer/Main.cs
index 2f01281..8f7d706 100644
--- a/OpenSim/Grid/AssetInventoryServer/Main.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Main.cs
@@ -28,7 +28,8 @@
  */
 
 using System;
-using System.ServiceProcess;
+using Nini.Config;
+using log4net.Config;
 
 namespace OpenSim.Grid.AssetInventoryServer
 {
@@ -36,28 +37,24 @@ namespace OpenSim.Grid.AssetInventoryServer
     {
         static void Main(string[] args)
         {
-#if DEBUG
-            AssetInventoryServer server = new AssetInventoryServer();
+            XmlConfigurator.Configure();
+
+            ArgvConfigSource configSource = new ArgvConfigSource(args);
+            configSource.AddSwitch("Startup", "inifile");
+
+            AssetInventoryServer server = new AssetInventoryServer(configSource);
             if (server.Start())
             {
-                Console.WriteLine("Asset server is running. Press CTRL+C to quit");
-
                 Console.CancelKeyPress +=
                     delegate(object sender, ConsoleCancelEventArgs e)
                     {
-                        Console.WriteLine("Asset server is shutting down...");
+                        Console.WriteLine("AssetInventory server is shutting down...");
                         server.Shutdown();
                         Environment.Exit(0);
                     };
 
                 server.Work();
-                //while (true)
-                //    Console.ReadLine();
             }
-#else
-            ServiceBase[] servicesToRun = new ServiceBase[] { new AssetInventoryServer() };
-            ServiceBase.Run(servicesToRun);
-#endif
         }
     }
 }