[Red5commits] [2388] Fixed connection issue and typos.

[TTriemstra]

Fixed connection issue and typos.


Timestamp: 10/11/07 17:32:28 EST (less than one hour ago) 
Change: 2388 
Author: TTriemstra

Files (see diff or trac for details): 
java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/client/AuthClientRegistry.java
java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/ScopeStatistics.java
java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/UserStatistics.java
java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/adminPanel.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2388

Index: /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/ScopeStatistics.java
===================================================================
--- /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/ScopeStatistics.java (revision 2385)
+++ /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/ScopeStatistics.java (revision 2388)
@@ -53,5 +53,5 @@
 		IScopeStatistics stats = root.getStatistics();
 		extractConnectionData(root);
-		addData ( "Persistance Data" ,"--" );
+		addData ( "Persistence Data" ,"--" );
     	IPersistenceStore data =  root.getStore();
     	Collection<IPersistable> objects = data.getObjects();
@@ -89,10 +89,10 @@
     		IConnection connection = conn.next();
 			addData ( "Scope statistics" ,"--" );
-    		addData ( "Send Bytes" , Utils.formatBytes(connection.getWrittenBytes()) );
-    		addData ( "Recieved Bytes" , Utils.formatBytes(connection.getReadBytes()) );
+    		addData ( "Send bytes" , Utils.formatBytes(connection.getWrittenBytes()) );
+    		addData ( "Received bytes" , Utils.formatBytes(connection.getReadBytes()) );
     		addData ( "Send messages" , connection.getWrittenMessages() );
     		addData ( "Dropped messages" , connection.getDroppedMessages() );
     		addData ( "Pending messages" , connection.getPendingMessages() );
-    		addData ( "Recieved messages" , connection.getReadMessages());
+    		addData ( "Received messages" , connection.getReadMessages());
     		addData ( "Remote address" , connection.getRemoteAddress()+":"+connection.getRemotePort()+" ("+connection.getHost()+")" );
     		addData ( "Path" , connection.getPath() );
Index: /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/adminPanel.java
===================================================================
--- /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/adminPanel.java (revision 2385)
+++ /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/adminPanel.java (revision 2388)
@@ -55,5 +55,5 @@
 	@Override
 	public boolean appStart(IScope app) {
-		log.info("Application started");
+		log.info("Admin application started");
 		return true;
 	}
@@ -63,5 +63,5 @@
 	public boolean connect(IConnection conn, IScope scope, Object[] params) {
     	this.scope = scope;
-    	
+    	/*
 		String id = conn.getSessionId();
 
@@ -74,5 +74,5 @@
 				.lookupClient(id) : clientRegistry.newClient(params);
 		conn.initialize(client);
-		
+		*/
 		return true;
 	}
@@ -249,5 +249,5 @@
 		// Unregister user.
 	//	String uid = clientMgr.removeClient(scope, rid);
-		log.info("Client (" + rid + ") disconnected.");
+		log.info("Client with id " + rid + " disconnected.");
 		super.disconnect(conn, scope);
 	}
Index: /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/UserStatistics.java
===================================================================
--- /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/UserStatistics.java (revision 2385)
+++ /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/UserStatistics.java (revision 2388)
@@ -80,8 +80,8 @@
     		IConnection connection = conn.next();		
 			addData ( "Scope statistics" ,"--" );
-    		addData ( "Send Bytes" , Utils.formatBytes(connection.getWrittenBytes()) );
-    		addData ( "Recieved Bytes" , Utils.formatBytes(connection.getReadBytes()) );
+    		addData ( "Send bytes" , Utils.formatBytes(connection.getWrittenBytes()) );
+    		addData ( "Received bytes" , Utils.formatBytes(connection.getReadBytes()) );
     		addData ( "Send messages" , connection.getWrittenMessages() );
-    		addData ( "Recieved messages" , connection.getReadMessages());
+    		addData ( "Received messages" , connection.getReadMessages());
     		addData ( "Dropped messages" , connection.getDroppedMessages() );
     		addData ( "Pending messages" , connection.getPendingMessages() );
Index: /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/client/AuthClientRegistry.java
===================================================================
--- /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/client/AuthClientRegistry.java (revision 2385)
+++ /java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/client/AuthClientRegistry.java (revision 2388)
@@ -54,5 +54,5 @@
 
 		if (params == null || params.length == 0) {
-			log.debug("Client didn't pass a username.");
+			log.warn("Client didn't pass a username.");
 			throw new ClientRejectedException();
 		}
@@ -89,5 +89,5 @@
 			addClient(client);
 			client.setAttribute("authInformation", t);
-			log.debug("Authenticated client with id " + client.getId());
+			log.debug("Authenticated client - username: " + username + ", id: " + client.getId());
 		}
 		


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.