aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.UserServer/Main.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenGridServices.UserServer/Main.cs')
-rw-r--r--OpenGridServices.UserServer/Main.cs17
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs
index 5334f96..ed7b768 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices.UserServer/Main.cs
@@ -74,7 +74,7 @@ namespace OpenGridServices.UserServer
74 74
75 private void Work() 75 private void Work()
76 { 76 {
77 m_console.WriteLine("\nEnter help for a list of commands\n"); 77 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"\nEnter help for a list of commands\n");
78 78
79 while (true) 79 while (true)
80 { 80 {
@@ -84,24 +84,21 @@ namespace OpenGridServices.UserServer
84 84
85 public void Startup() 85 public void Startup()
86 { 86 {
87 MainConsole.Instance.WriteLine("Main.cs:Startup() - Loading configuration"); 87 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration");
88 Cfg = this.LoadConfigDll(this.ConfigDll); 88 Cfg = this.LoadConfigDll(this.ConfigDll);
89 Cfg.InitConfig(); 89 Cfg.InitConfig();
90 90
91 MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager"); 91 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Creating user profile manager");
92 m_userProfileManager = new UserProfileManager(); 92 m_userProfileManager = new UserProfileManager();
93 m_userProfileManager.InitUserProfiles(); 93 m_userProfileManager.InitUserProfiles();
94 m_userProfileManager.SetKeys(Cfg.GridSendKey, Cfg.GridRecvKey, Cfg.GridServerURL, Cfg.DefaultStartupMsg); 94 m_userProfileManager.SetKeys(Cfg.GridSendKey, Cfg.GridRecvKey, Cfg.GridServerURL, Cfg.DefaultStartupMsg);
95 95
96 MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process"); 96 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
97 BaseHttpServer httpServer = new BaseHttpServer(8002); 97 BaseHttpServer httpServer = new BaseHttpServer(8002);
98 98
99 httpServer.AddXmlRPCHandler("login_to_simulator", m_userProfileManager.XmlRpcLoginMethod); 99 httpServer.AddXmlRPCHandler("login_to_simulator", m_userProfileManager.XmlRpcLoginMethod);
100 httpServer.AddRestHandler("DELETE", "/usersessions/", m_userProfileManager.RestDeleteUserSessionMethod); 100 httpServer.AddRestHandler("DELETE", "/usersessions/", m_userProfileManager.RestDeleteUserSessionMethod);
101 101
102 // I guess that this was never used?
103 //Listener.Prefixes.Add("http://+:8002/userserver/");
104
105 httpServer.Start(); 102 httpServer.Start();
106 } 103 }
107 104
@@ -111,7 +108,7 @@ namespace OpenGridServices.UserServer
111 switch (what) 108 switch (what)
112 { 109 {
113 case "user": 110 case "user":
114 m_console.WriteLine("Creating new user profile"); 111 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Creating new user profile");
115 string tempfirstname; 112 string tempfirstname;
116 string templastname; 113 string templastname;
117 string tempMD5Passwd; 114 string tempMD5Passwd;
@@ -143,8 +140,8 @@ namespace OpenGridServices.UserServer
143 switch (cmd) 140 switch (cmd)
144 { 141 {
145 case "help": 142 case "help":
146 m_console.WriteLine("create user - create a new user"); 143 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"create user - create a new user");
147 m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)"); 144 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"shutdown - shutdown the grid (USE CAUTION!)");
148 break; 145 break;
149 146
150 case "create": 147 case "create":