OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the console port setting to ROBUST, too

mysql-performance
Melanie 2010-01-11 03:49:05 +00:00
parent e966e51b89
commit 2b478a61d0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Server/Base/HttpServerBase.cs
View File

@ -49,6 +49,7 @@ namespace OpenSim.Server.Base
protected uint m_Port = 0; protected uint m_Port = 0;
protected Dictionary<uint, BaseHttpServer> m_Servers = protected Dictionary<uint, BaseHttpServer> m_Servers =
new Dictionary<uint, BaseHttpServer>(); new Dictionary<uint, BaseHttpServer>();
protected uint m_consolePort = 0;
public IHttpServer HttpServer public IHttpServer HttpServer
{ {
@ -98,6 +99,7 @@ namespace OpenSim.Server.Base
Thread.CurrentThread.Abort(); Thread.CurrentThread.Abort();
} }
m_consolePort = (uint)networkConfig.GetInt("ConsolePort", 0);
m_Port = port; m_Port = port;
m_HttpServer = new BaseHttpServer(port); m_HttpServer = new BaseHttpServer(port);
@ -111,7 +113,10 @@ namespace OpenSim.Server.Base
if (MainConsole.Instance is RemoteConsole) if (MainConsole.Instance is RemoteConsole)
{ {
((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer); if (m_consolePort == 0)
((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
else
((RemoteConsole)MainConsole.Instance).SetServer(GetHttpServer(m_consolePort));
} }
} }
} }

1
bin/OpenSim.Server.ini.example
View File

@ -22,6 +22,7 @@ port = 8003
; * Leave commented to diable logins to the console ; * Leave commented to diable logins to the console
;ConsoleUser = Test ;ConsoleUser = Test
;ConsolePass = secret ;ConsolePass = secret
;ConsolePort = 0
; * As an example, the below configuration precisely mimicks the legacy ; * As an example, the below configuration precisely mimicks the legacy
; * asset server. It is read by the asset IN connector (defined above) ; * asset server. It is read by the asset IN connector (defined above)