diff options
Diffstat (limited to 'OpenGridServices/OpenGridServices.UserServer/Main.cs')
-rw-r--r-- | OpenGridServices/OpenGridServices.UserServer/Main.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs index c17d2c6..56a3892 100644 --- a/OpenGridServices/OpenGridServices.UserServer/Main.cs +++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs | |||
@@ -57,7 +57,7 @@ namespace OpenGridServices.UserServer | |||
57 | 57 | ||
58 | public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); | 58 | public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); |
59 | 59 | ||
60 | ConsoleBase m_console; | 60 | LogBase m_console; |
61 | 61 | ||
62 | [STAThread] | 62 | [STAThread] |
63 | public static void Main(string[] args) | 63 | public static void Main(string[] args) |
@@ -72,8 +72,8 @@ namespace OpenGridServices.UserServer | |||
72 | 72 | ||
73 | private OpenUser_Main() | 73 | private OpenUser_Main() |
74 | { | 74 | { |
75 | m_console = new ConsoleBase("opengrid-userserver-console.log", "OpenUser", this , false); | 75 | m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false); |
76 | MainConsole.Instance = m_console; | 76 | MainLog.Instance = m_console; |
77 | } | 77 | } |
78 | 78 | ||
79 | private void Work() | 79 | private void Work() |
@@ -82,7 +82,7 @@ namespace OpenGridServices.UserServer | |||
82 | 82 | ||
83 | while (true) | 83 | while (true) |
84 | { | 84 | { |
85 | m_console.MainConsolePrompt(); | 85 | m_console.MainLogPrompt(); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
@@ -93,16 +93,16 @@ namespace OpenGridServices.UserServer | |||
93 | this.ConfigDB(this.localXMLConfig); | 93 | this.ConfigDB(this.localXMLConfig); |
94 | this.localXMLConfig.Close(); | 94 | this.localXMLConfig.Close(); |
95 | 95 | ||
96 | MainConsole.Instance.Verbose("Main.cs:Startup() - Loading configuration"); | 96 | MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration"); |
97 | Cfg = this.LoadConfigDll(this.ConfigDll); | 97 | Cfg = this.LoadConfigDll(this.ConfigDll); |
98 | Cfg.InitConfig(); | 98 | Cfg.InitConfig(); |
99 | 99 | ||
100 | MainConsole.Instance.Verbose( "Main.cs:Startup() - Establishing data connection"); | 100 | MainLog.Instance.Verbose( "Main.cs:Startup() - Establishing data connection"); |
101 | m_userManager = new UserManager(); | 101 | m_userManager = new UserManager(); |
102 | m_userManager._config = Cfg; | 102 | m_userManager._config = Cfg; |
103 | m_userManager.AddPlugin(StorageDll); | 103 | m_userManager.AddPlugin(StorageDll); |
104 | 104 | ||
105 | MainConsole.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); | 105 | MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); |
106 | BaseHttpServer httpServer = new BaseHttpServer(8002); | 106 | BaseHttpServer httpServer = new BaseHttpServer(8002); |
107 | 107 | ||
108 | httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); | 108 | httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); |