Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [630] maven/trunk/ogoglio-server/src/main/java/com/ ogoglio
|
From: <tre...@us...> - 2007-12-13 01:29:41
|
Revision: 630
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=630&view=rev
Author: trevorolio
Date: 2007-12-12 17:29:46 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
Removed old debug messages.
Modified Paths:
--------------
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/Sim.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SimMessageHandler.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
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-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -100,7 +100,6 @@
//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-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -47,7 +47,6 @@
public static void addChannel(String subspace, CometChannelManager mgr) {
if (!clientChannelMap.containsKey(subspace)) {
clientChannelMap.put(subspace, Collections.synchronizedList(new ArrayList()));
- Log.info("Comet listener on space:" + subspace);
}
List clienChannList = (List) clientChannelMap.get(subspace);
clienChannList.add(mgr);
@@ -87,14 +86,12 @@
response.flushBuffer();
} else if (event.getEventType() == CometEvent.EventType.ERROR) {
if (event.getEventSubType().equals(CometEvent.EventSubType.TIMEOUT)) {
- //Log.info("Ignoring timeout on session "+ request.getSession(true).getId());
return;
}
Log.error("Error for session: " + request.getSession(true).getId() + "-->" + event.getEventSubType());
closeComet(event);
} else if (event.getEventType() == CometEvent.EventType.END) {
closeComet(event);
- //Log.info("End for session: " + request.getSession(true).getId());
} else if (event.getEventType() == CometEvent.EventType.READ) {
if (drainDataBuffer(event, request)) {
response.flushBuffer();
@@ -111,7 +108,6 @@
CometChannelManager mgr = (CometChannelManager) iterator.next();
mgr.connectionDropped(event);
}
- 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 +141,6 @@
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());
}
private boolean drainDataBuffer(CometEvent event, HttpServletRequest request) throws IOException {
@@ -167,7 +162,6 @@
} 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());
closeComet(event);
return false;
}
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java 2007-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -296,19 +296,14 @@
return simulator;
}
- Log.debug("Sim.getOrCreateSpaceSim: don't have space doc cached.");
SpaceDocument spaceDoc = null;
try {
- Log.debug("Sim.getOrCreateSpaceSim: about to read it from the media service!");
spaceDoc = getSpaceDocument(record.getSpaceID());
- Log.debug("Sim.getOrCreateSpaceSim: Media service:" + (spaceDoc == null));
} catch (IOException e) {
}
if (spaceDoc == null) {
- Log.debug("Sim.getOrCreateSpaceSim:Now trying to get it from the DocumentFactory.");
spaceDoc = DocumentFactory.documentFromRecord(record);
} else {
- Log.debug("Sim.getOrCreateSpaceSim: Setting basic properties... why aren't these there before?");
spaceDoc.setDisplayName(record.getDisplayName());
spaceDoc.setMaxGuests(record.getMaxGuests());
spaceDoc.setSimID(record.getSimID());
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SimMessageHandler.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SimMessageHandler.java 2007-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SimMessageHandler.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -56,7 +56,6 @@
Log.error("Somebody sent message with the 'heartbeat' space id:"+message.getPayload());
}
- //Log.info("Sim is ignoring heartbeat from proxy.");
return;
}
@@ -71,7 +70,6 @@
SpaceSimulator ss=(SpaceSimulator)allSpaces[i];
buffer.append(" "+ss.getSpaceID());
}
- Log.info("Currently supporting spaces:"+buffer);
return;
}
}
@@ -85,9 +83,7 @@
} else if (message.getPayload() instanceof PayloadFactory.LoggedOutPayload) {
PayloadFactory.LoggedOutPayload payload = (PayloadFactory.LoggedOutPayload) message.getPayload();
- Log.info("Client "+payload.getUsername()+" sent logged out!");
spaceSim.userLoggedOut(payload.getUsername());
- Log.info("Sim finished telling the spacesim about the logout.");
} else {
Log.error("Sim received unknown payload in this message: " + message);
}
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java 2007-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -102,7 +102,6 @@
renderer.setSimCamera(); //Sigh, you have to add a view before it will schedule the behavior
ThingDocument[] thingDocs = spaceDocument.getThingDocuments();
- Log.debug("Initialization SpaceSimulator on space " + spaceDocument.getSpaceID() + " with " + thingDocs.length);
for (int i = 0; i < thingDocs.length; i++) {
TemplateDocument templateDoc = listener.getTemplateDocument(thingDocs[i].getTemplateID());
if (templateDoc == null) {
@@ -196,7 +195,6 @@
public void startSim() {
simThread.setName("space-" + space.getSpaceID());
- //Log.info("Starting up thread: "+simThread.getName());
simThread.start();
}
@@ -717,7 +715,6 @@
public ThingDocument[] getThingDocuments() {
Thing[] things = space.getThings();
- Log.debug("SpaceSimulator: asked space object how many things:" + things.length);
ThingDocument[] results = new ThingDocument[things.length];
for (int i = 0; i < results.length; i++) {
results[i] = new ThingDocument(things[i]);
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-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -95,10 +95,10 @@
//don't bother with the sim if nobody wants it
if (servletNeeded) {
- String tmpSimUrl=(String) envCtx.lookup(OGOGLIO_BASE_SIM_URL_KEY);
+ String tmpSimUrl = (String) envCtx.lookup(OGOGLIO_BASE_SIM_URL_KEY);
if (!tmpSimUrl.endsWith("/")) {
- tmpSimUrl=tmpSimUrl+"/";
- Log.warn(OGOGLIO_BASE_SIM_URL_KEY+" in server.xml should end in / but we are patching it:"+tmpSimUrl);
+ tmpSimUrl = tmpSimUrl + "/";
+ Log.warn(OGOGLIO_BASE_SIM_URL_KEY + " in server.xml should end in / but we are patching it:" + tmpSimUrl);
}
simURI = new URI(tmpSimUrl);
SimRecord simRecord = SimPersistTasks.findSimsBySimURI(simURI, getSessionFactory());
@@ -113,10 +113,10 @@
}
WebAPIDescriptor descriptor;
String serviceURI = (String) envCtx.lookup("ogoglio/baseURL");
- if ((serviceURI==null) || (serviceURI.trim().equals(""))) {
+ if ((serviceURI == null) || (serviceURI.trim().equals(""))) {
throw new ServletException("Unable to fetch ogoglio/baseURL from the server.xml file!");
}
- descriptor=new WebAPIDescriptor(new URI(serviceURI));
+ descriptor = new WebAPIDescriptor(new URI(serviceURI));
sim = new Sim(simRecord, getMediaService(), getSessionFactory(), descriptor);
localIP = InetAddress.getByName(simURI.getHost()).getHostAddress();
}
@@ -484,11 +484,8 @@
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
- Log.debug("GET on SimServlet.ThingsResource: "+requestedSpaceID+" --- how many possessions?"+
- (PossessionPersistTasks.findPossessionsBySpaceID(requestedSpaceID, getSessionFactory())));
SpaceSimulator simulator = sim.getOrCreateSpaceSimulator(spaceRecord);
ThingDocument[] thingDocs = simulator.getThingDocuments();
- Log.debug("SimServlet, Thing request:"+thingDocs.length);
XMLElement list = new XMLElement("list");
for (int i = 0; i < thingDocs.length; i++) {
list.addChild(thingDocs[i].toElement());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
