diff options
author | Diva Canto | 2013-05-13 13:07:39 -0700 |
---|---|---|
committer | Diva Canto | 2013-05-13 13:07:39 -0700 |
commit | 4194d935ecd21a922859a640cb28acec7e5bae45 (patch) | |
tree | 2e673266346c5561729f90414307c04ed2265e34 /OpenSim | |
parent | Groups: Improve error handling on remote connector. (diff) | |
download | opensim-SC_OLD-4194d935ecd21a922859a640cb28acec7e5bae45.zip opensim-SC_OLD-4194d935ecd21a922859a640cb28acec7e5bae45.tar.gz opensim-SC_OLD-4194d935ecd21a922859a640cb28acec7e5bae45.tar.bz2 opensim-SC_OLD-4194d935ecd21a922859a640cb28acec7e5bae45.tar.xz |
Fixed mantis #6609 -- LoadPlugin error messages on Robust.
Diffstat (limited to 'OpenSim')
5 files changed, 26 insertions, 7 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 25957d3..08ba50d 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -286,7 +286,7 @@ namespace OpenSim.Server.Base | |||
286 | e.InnerException == null ? e.Message : e.InnerException.Message, | 286 | e.InnerException == null ? e.Message : e.InnerException.Message, |
287 | e.StackTrace); | 287 | e.StackTrace); |
288 | } | 288 | } |
289 | m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1}", dllName, e.Message); | 289 | m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1} args.Length {2}", dllName, e.Message, args.Length); |
290 | return null; | 290 | return null; |
291 | } | 291 | } |
292 | 292 | ||
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs index 0d4990a..ffe2f36 100644 --- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs | |||
@@ -76,10 +76,14 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
76 | server.AddStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy)); | 76 | server.AddStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy)); |
77 | } | 77 | } |
78 | 78 | ||
79 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server) | 79 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, string configName) |
80 | : this(config, server, null) | 80 | : this(config, server, (ISimulationService)null) |
81 | { | 81 | { |
82 | } | 82 | } |
83 | 83 | ||
84 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server) | ||
85 | : this(config, server, String.Empty) | ||
86 | { | ||
87 | } | ||
84 | } | 88 | } |
85 | } | 89 | } |
diff --git a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs index 80eb5d2..8145a21 100644 --- a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs | |||
@@ -54,10 +54,15 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
54 | private IInstantMessage m_IMService; | 54 | private IInstantMessage m_IMService; |
55 | 55 | ||
56 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : | 56 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : |
57 | this(config, server, null) | 57 | this(config, server, (IInstantMessageSimConnector)null) |
58 | { | 58 | { |
59 | } | 59 | } |
60 | 60 | ||
61 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) : | ||
62 | this(config, server) | ||
63 | { | ||
64 | } | ||
65 | |||
61 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, IInstantMessageSimConnector simConnector) : | 66 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, IInstantMessageSimConnector simConnector) : |
62 | base(config, server, String.Empty) | 67 | base(config, server, String.Empty) |
63 | { | 68 | { |
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index db62aaa..b20f467 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
@@ -62,10 +62,15 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
62 | private bool m_VerifyCallers = false; | 62 | private bool m_VerifyCallers = false; |
63 | 63 | ||
64 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : | 64 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : |
65 | this(config, server, null) | 65 | this(config, server, (IFriendsSimConnector)null) |
66 | { | 66 | { |
67 | } | 67 | } |
68 | 68 | ||
69 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) : | ||
70 | this(config, server) | ||
71 | { | ||
72 | } | ||
73 | |||
69 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : | 74 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : |
70 | base(config, server, String.Empty) | 75 | base(config, server, String.Empty) |
71 | { | 76 | { |
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs index 9a7ad34..1fb0dbc 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs | |||
@@ -60,8 +60,8 @@ namespace OpenSim.Server.Handlers.Login | |||
60 | InitializeHandlers(server); | 60 | InitializeHandlers(server); |
61 | } | 61 | } |
62 | 62 | ||
63 | public LLLoginServiceInConnector(IConfigSource config, IHttpServer server) : | 63 | public LLLoginServiceInConnector(IConfigSource config, IHttpServer server, string configName) : |
64 | base(config, server, String.Empty) | 64 | base(config, server, configName) |
65 | { | 65 | { |
66 | string loginService = ReadLocalServiceFromConfig(config); | 66 | string loginService = ReadLocalServiceFromConfig(config); |
67 | 67 | ||
@@ -72,6 +72,11 @@ namespace OpenSim.Server.Handlers.Login | |||
72 | InitializeHandlers(server); | 72 | InitializeHandlers(server); |
73 | } | 73 | } |
74 | 74 | ||
75 | public LLLoginServiceInConnector(IConfigSource config, IHttpServer server) : | ||
76 | this(config, server, String.Empty) | ||
77 | { | ||
78 | } | ||
79 | |||
75 | private string ReadLocalServiceFromConfig(IConfigSource config) | 80 | private string ReadLocalServiceFromConfig(IConfigSource config) |
76 | { | 81 | { |
77 | IConfig serverConfig = config.Configs["LoginService"]; | 82 | IConfig serverConfig = config.Configs["LoginService"]; |