aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-09-21 14:59:31 +0100
committerMelanie2009-09-21 14:59:31 +0100
commit04170521f081bf009bf15f76451b119dc280a438 (patch)
tree8ddf52511caf4331abd8f183b98e590b582abe77
parentA small fix for remote console to accommodate PollServiceArgs behavior a (diff)
downloadopensim-SC-04170521f081bf009bf15f76451b119dc280a438.zip
opensim-SC-04170521f081bf009bf15f76451b119dc280a438.tar.gz
opensim-SC-04170521f081bf009bf15f76451b119dc280a438.tar.bz2
opensim-SC-04170521f081bf009bf15f76451b119dc280a438.tar.xz
Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs6
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs4
5 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index a005e20..5a18b94 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -393,12 +393,12 @@ namespace OpenSim.Framework.Console
393 lock (m_Connections) 393 lock (m_Connections)
394 { 394 {
395 if (!m_Connections.ContainsKey(sessionID)) 395 if (!m_Connections.ContainsKey(sessionID))
396 return NoEvents(); 396 return NoEvents(UUID.Zero);
397 c = m_Connections[sessionID]; 397 c = m_Connections[sessionID];
398 } 398 }
399 c.last = System.Environment.TickCount; 399 c.last = System.Environment.TickCount;
400 if (c.lastLineSeen >= m_LineNumber) 400 if (c.lastLineSeen >= m_LineNumber)
401 return NoEvents(); 401 return NoEvents(UUID.Zero);
402 402
403 Hashtable result = new Hashtable(); 403 Hashtable result = new Hashtable();
404 404
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Console
440 return result; 440 return result;
441 } 441 }
442 442
443 private Hashtable NoEvents() 443 private Hashtable NoEvents(UUID id)
444 { 444 {
445 Hashtable result = new Hashtable(); 445 Hashtable result = new Hashtable();
446 446
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index fed490e..ed387d1 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Servers.HttpServer
34 34
35 public delegate Hashtable GetEventsMethod(UUID pId, string request); 35 public delegate Hashtable GetEventsMethod(UUID pId, string request);
36 36
37 public delegate Hashtable NoEventsMethod(); 37 public delegate Hashtable NoEventsMethod(UUID pId);
38 38
39 public class PollServiceEventArgs : EventArgs 39 public class PollServiceEventArgs : EventArgs
40 { 40 {
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 4020190..db80f1d 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Framework.Servers.HttpServer
130 foreach (object o in m_requests) 130 foreach (object o in m_requests)
131 { 131 {
132 PollServiceHttpRequest req = (PollServiceHttpRequest) o; 132 PollServiceHttpRequest req = (PollServiceHttpRequest) o;
133 m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(), new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext)); 133 m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.PollServiceArgs.Id), new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
134 } 134 }
135 135
136 m_requests.Clear(); 136 m_requests.Clear();
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 41fb376..1e8706c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Servers.HttpServer
112 { 112 {
113 if ((Environment.TickCount - req.RequestTime) > m_timeout) 113 if ((Environment.TickCount - req.RequestTime) > m_timeout)
114 { 114 {
115 m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(), 115 m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.PollServiceArgs.Id),
116 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext)); 116 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
117 } 117 }
118 else 118 else
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index 34d46a0..26eed42 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
350 lock (queue) 350 lock (queue)
351 { 351 {
352 if (queue.Count == 0) 352 if (queue.Count == 0)
353 return NoEvents(); 353 return NoEvents(pAgentId);
354 element = queue.Dequeue(); // 15s timeout 354 element = queue.Dequeue(); // 15s timeout
355 } 355 }
356 356
@@ -398,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
398 //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]); 398 //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
399 } 399 }
400 400
401 public Hashtable NoEvents() 401 public Hashtable NoEvents(UUID agentID)
402 { 402 {
403 Hashtable responsedata = new Hashtable(); 403 Hashtable responsedata = new Hashtable();
404 responsedata["int_response_code"] = 502; 404 responsedata["int_response_code"] = 502;