Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [627] maven/trunk
|
From: <ian...@us...> - 2007-12-12 17:47:06
|
Revision: 627
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=627&view=rev
Author: iansmith
Date: 2007-12-12 09:46:59 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
Added some debugging logs to various parts of the comet chain so we can see what happens as tours get started.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -62,11 +62,15 @@
}
private static void sendHTTPStartupInfo(Writer wr, String host, String path) throws IOException {
- sendLine("POST "+path+" HTTP/1.1", wr);
+ Log.debug("About to send POST to "+path+" on "+host);
+ /*sendLine("POST "+path+" HTTP/1.1", wr);
+ HACK FOR DEALING WITH MOD_PROXY IN APACHE 2.2*/
+ sendLine("GET "+path+" HTTP/1.1", wr);
sendLine("Host: "+host, wr);
sendLine("Transfer-encoding: chunked",wr);
sendLine("",wr);
wr.flush();
+ Log.debug("GET/POST Sent!");
}
private static String getHTTPResponse(InputStream is) throws IOException {
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -100,7 +100,7 @@
//the buffer is critical here
StringBuffer buff=(StringBuffer)sessionToBuffer.get(event);
buff.append(tmp);
-
+ Log.debug("Added some text to the buffer in ChanMgr:"+buff.toString());
String msg = CometClient.pullOutNextMessage(buff);
if (msg!=null) {
messageDone((TCPChannel) sessionToChannel.get(event), msg, event);
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -111,7 +111,7 @@
CometChannelManager mgr = (CometChannelManager) iterator.next();
mgr.connectionDropped(event);
}
- //Log.info("Destroyed comet info for path "+path+":"+event.getHttpServletRequest().getSession(true).getId());
+ Log.info("Destroyed comet info for path "+path+":"+event.getHttpServletRequest().getSession(true).getId());
} else {
Log.warn("Close comet on path " + path + " but nobody interested....");
}
@@ -145,7 +145,7 @@
mgr.addConnection(event, channel);
//in 6.0.14 this is an unsupported operation
//event.setTimeout(30000);
- //Log.info("Added comet connection for path "+event.getHttpServletRequest().getPathInfo()+":"+event.getHttpServletRequest().getSession(true).getId());
+ Log.info("Added comet connection for path "+event.getHttpServletRequest().getPathInfo()+":"+event.getHttpServletRequest().getSession(true).getId());
}
private boolean drainDataBuffer(CometEvent event, HttpServletRequest request) throws IOException {
@@ -167,7 +167,7 @@
} while (is.available() > 0);
return true;
} catch (IOException exception) {
- //Log.info("Client appears to have closed the comet connection:" + event.getHttpServletRequest().getSession(true).getId()+". Closing it b/c:"+exception.getMessage()+" of type "+exception.getClass().getName());
+ Log.info("Client appears to have closed the comet connection:" + event.getHttpServletRequest().getSession(true).getId()+". Closing it b/c:"+exception.getMessage()+" of type "+exception.getClass().getName());
closeComet(event);
return false;
}
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -134,13 +134,15 @@
public void destroy() {
try {
super.destroy();
- sim.cleanup();
- SimRecord rec = SimPersistTasks.findSimsBySimURI(simURI, getSessionFactory());
- if (rec == null) {
- Log.warn("Destroy: Can't find URI in database during shutdown of sim! URI=" + simURI);
- } else {
- Log.info("Destroy: Removing " + simURI + " from database list of sims.");
- SimPersistTasks.delete(rec, getSessionFactory());
+ if (servletNeeded) {
+ sim.cleanup();
+ SimRecord rec = SimPersistTasks.findSimsBySimURI(simURI, getSessionFactory());
+ if (rec == null) {
+ Log.warn("Destroy: Can't find URI in database during shutdown of sim! URI=" + simURI);
+ } else {
+ Log.info("Destroy: Removing " + simURI + " from database list of sims.");
+ SimPersistTasks.delete(rec, getSessionFactory());
+ }
}
} catch (PersistException e) {
Log.error("Can't clean up Sim record in database:" + e.getMessage(), e);
Modified: maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -126,6 +126,15 @@
transform.setEuler(new Vector3d(rx, ry, rz));
transform.setTranslation(new Vector3d(x, y, z));
spaceClient.viewpointMotionStopped(transform);
+ if (spaceClient.getSpace()==null) {
+ Log.warn("No space in space client!");
+ }
+ if (spaceClient.getUsername()==null) {
+ Log.warn("No username in space client");
+ }
+ if (spaceClient.getSpace().getUser(spaceClient.getUsername())==null) {
+ Log.warn("No user by that name in the space!");
+ }
spaceClient.getSpace().getUser(spaceClient.getUsername()).setPosition(transform);
}
renderer = new J3DRenderer(spaceClient, false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
