diff options
-rw-r--r-- | OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs | 11 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer.Modules/MessageService.cs | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs index ae04535..90490dc 100644 --- a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs | |||
@@ -50,7 +50,10 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
50 | 50 | ||
51 | private IGridServiceCore m_messageCore; | 51 | private IGridServiceCore m_messageCore; |
52 | 52 | ||
53 | private Timer reconnectTimer = new Timer(300000); // 5 mins | 53 | /// <value> |
54 | /// Reregister with the user service every 5 minutes | ||
55 | /// </value> | ||
56 | private Timer reconnectTimer = new Timer(300000); | ||
54 | 57 | ||
55 | public InterMessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore) | 58 | public InterMessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore) |
56 | { | 59 | { |
@@ -69,13 +72,11 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
69 | 72 | ||
70 | public void PostInitialise() | 73 | public void PostInitialise() |
71 | { | 74 | { |
72 | |||
73 | } | 75 | } |
74 | 76 | ||
75 | public void RegisterHandlers() | 77 | public void RegisterHandlers() |
76 | { | 78 | { |
77 | //have these in separate method as some servers restart the http server and reregister all the handlers. | 79 | //have these in separate method as some servers restart the http server and reregister all the handlers. |
78 | |||
79 | } | 80 | } |
80 | 81 | ||
81 | public void registerWithUserServer(object sender, ElapsedEventArgs e) | 82 | public void registerWithUserServer(object sender, ElapsedEventArgs e) |
@@ -121,7 +122,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
121 | if (!GridRespData.ContainsKey("responsestring")) | 122 | if (!GridRespData.ContainsKey("responsestring")) |
122 | success = false; | 123 | success = false; |
123 | else | 124 | else |
124 | m_log.InfoFormat("[SERVER] Registered with {0}", srv); | 125 | m_log.DebugFormat("[SERVER]: Registered with user service at {0}", srv); |
125 | } | 126 | } |
126 | catch | 127 | catch |
127 | { | 128 | { |
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs index 8ad1e9c..a3950ce 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs | |||
@@ -92,7 +92,6 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
92 | public void RegisterHandlers() | 92 | public void RegisterHandlers() |
93 | { | 93 | { |
94 | //have these in separate method as some servers restart the http server and reregister all the handlers. | 94 | //have these in separate method as some servers restart the http server and reregister all the handlers. |
95 | |||
96 | } | 95 | } |
97 | 96 | ||
98 | #region FriendList Methods | 97 | #region FriendList Methods |
@@ -361,7 +360,6 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
361 | up.OnlineYN = true; | 360 | up.OnlineYN = true; |
362 | up.lookupUserRegionYN = false; | 361 | up.lookupUserRegionYN = false; |
363 | ProcessFriendListSubscriptions(up); | 362 | ProcessFriendListSubscriptions(up); |
364 | |||
365 | } | 363 | } |
366 | catch (Exception e) | 364 | catch (Exception e) |
367 | { | 365 | { |
@@ -369,7 +367,6 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
369 | } | 367 | } |
370 | 368 | ||
371 | return new XmlRpcResponse(); | 369 | return new XmlRpcResponse(); |
372 | |||
373 | } | 370 | } |
374 | 371 | ||
375 | /// <summary> | 372 | /// <summary> |