[Red5commits] [2460] --

[pgregoire]

--


Timestamp: 11/05/07 20:48:46 EST (less than one hour ago) 
Change: 2460 
Author: pgregoire

Files (see diff or trac for details): 
java/server/trunk/conf/logback.xml
java/server/trunk/webapps/oflaDemo/WEB-INF/src/org/red5/server/webapp/oflaDemo/DemoService.java


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

Index: /java/server/trunk/conf/logback.xml
===================================================================
--- /java/server/trunk/conf/logback.xml (revision 2429)
+++ /java/server/trunk/conf/logback.xml (revision 2460)
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<configuration>
-		<consolePlugin port="4321" />
-	</configuration>
+	<consolePlugin/>
 	<!-- Appenders http://logback.qos.ch/manual/appenders.html -->
 	<appender name="CONSOLE"
Index: /java/server/trunk/webapps/oflaDemo/WEB-INF/src/org/red5/server/webapp/oflaDemo/DemoService.java
===================================================================
--- /java/server/trunk/webapps/oflaDemo/WEB-INF/src/org/red5/server/webapp/oflaDemo/DemoService.java (revision 2459)
+++ /java/server/trunk/webapps/oflaDemo/WEB-INF/src/org/red5/server/webapp/oflaDemo/DemoService.java (revision 2460)
@@ -49,7 +49,7 @@
 					String flvBytes = Long.toString(file.length());
 					if (log.isDebugEnabled()) {
-						log.debug("flvName: " + flvName);
-						log.debug("lastModified date: " + lastModified);
-						log.debug("flvBytes: " + flvBytes);
+						log.debug("flvName: {}", flvName);
+						log.debug("lastModified date: {}", lastModified);
+						log.debug("flvBytes: {}", flvBytes);
 						log.debug("-------");
 					}
@@ -71,7 +71,7 @@
 					String flvBytes = Long.toString(file.length());
 					if (log.isDebugEnabled()) {
-						log.debug("flvName: " + flvName);
-						log.debug("lastModified date: " + lastModified);
-						log.debug("flvBytes: " + flvBytes);
+						log.debug("flvName: {}", flvName);
+						log.debug("lastModified date: {}", lastModified);
+						log.debug("flvBytes: {}", flvBytes);
 						log.debug("-------");
 					}
@@ -84,5 +84,5 @@
 			}
 		} catch (IOException e) {
-			log.error(e);
+			log.error("{}", e);
 		}
 		return filesMap;


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