- logback-dev - mailman3.qos.ch

svn commit: r531 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Fri Sep 8 00:09:16 2006 New Revision: 531 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java Log: how about public class? Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java Fri Sep 8 00:09:16 2006 @@ -1,6 +1,6 @@ package ch.qos.logback.classic; -class TestThread extends Thread { +public class TestThread extends Thread { String val;

1 0

svn commit: r530 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Fri Sep 8 00:08:22 2006 New Revision: 530 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java Log: better luck with public constructor? Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java Fri Sep 8 00:08:22 2006 @@ -3,10 +3,12 @@ class TestThread extends Thread { String val; - TestThread(String val) { + + public TestThread(String val) { super(); this.val = val; } + String x0; String x1; String x2;

1 0

svn commit: r529 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Fri Sep 8 00:01:43 2006 New Revision: 529 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java Log: call super constructor Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java Fri Sep 8 00:01:43 2006 @@ -4,6 +4,7 @@ String val; TestThread(String val) { + super(); this.val = val; } String x0;

1 0

svn commit: r528 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Thu Sep 7 23:58:49 2006 New Revision: 528 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java Log: Apprently, linux does not like it when a thread class is defined in another one. Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java Thu Sep 7 23:58:49 2006 @@ -27,23 +27,3 @@ } } - -class TestThread extends Thread { - - String val; - TestThread(String val) { - this.val = val; - } - String x0; - String x1; - String x2; - - public void run() { - x0 = MDC.get("x"); - MDC.put("x", val); - x1 = MDC.get("x"); - MDC.clear(); - x2 = MDC.get("x"); - System.out.println("Exiting "+val); - } -} \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java Thu Sep 7 23:58:49 2006 @@ -20,6 +20,7 @@ suite.addTestSuite(PatternLayoutTest.class); suite.addTestSuite(BasicLoggerTest.class); suite.addTestSuite(MessageFormattingTest.class); + suite.addTestSuite(MDCTest.class); return suite; } } \ No newline at end of file Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestThread.java Thu Sep 7 23:58:49 2006 @@ -0,0 +1,21 @@ +package ch.qos.logback.classic; + +class TestThread extends Thread { + + String val; + TestThread(String val) { + this.val = val; + } + String x0; + String x1; + String x2; + + public void run() { + x0 = MDC.get("x"); + MDC.put("x", val); + x1 = MDC.get("x"); + MDC.clear(); + x2 = MDC.get("x"); + System.out.println("Exiting "+val); + } +} \ No newline at end of file

1 0

svn commit: r527 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Thu Sep 7 23:31:27 2006 New Revision: 527 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: Same problem and same solution as for SyslogAppenderTest Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Thu Sep 7 23:31:27 2006 @@ -23,7 +23,9 @@ public void testRecieveMessage() throws InterruptedException { MockSocketServer mockServer = new MockSocketServer(1); mockServer.start(); - //mockServer.join(1000); + // give MockSyslogServer head start + Thread.sleep(100); + // client configuration LoggerContext lc = new LoggerContext();

1 0

svn commit: r526 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Thu Sep 7 23:18:45 2006 New Revision: 526 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Log: - All tests pass on Linux Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java Thu Sep 7 23:18:45 2006 @@ -20,23 +20,26 @@ */ public class MockSyslogServer extends Thread { - static final int PORT = 14805; + static final int PORT = 14500; final int loopLen; - + final int port; + List<String> msgList = new ArrayList<String>(); boolean finished = false; - MockSyslogServer(int loopLen) { + MockSyslogServer(int loopLen, int port) { super(); this.loopLen = loopLen; + this.port = port; } @Override public void run() { + System.out.println("MockSyslogServer listening on port "+port); DatagramSocket socket = null; try { - socket = new DatagramSocket(PORT); + socket = new DatagramSocket(port); for (int i = 0; i < loopLen; i++) { byte[] buf = new byte[2048]; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Thu Sep 7 23:18:45 2006 @@ -30,8 +30,12 @@ } public void testBasic() throws InterruptedException { - MockSyslogServer mockServer = new MockSyslogServer(1); + int port = MockSyslogServer.PORT+1; + + MockSyslogServer mockServer = new MockSyslogServer(1, port); mockServer.start(); + // give MockSyslogServer head start + Thread.sleep(100); LoggerContext lc = new LoggerContext(); lc.setName("test"); @@ -39,7 +43,7 @@ sa.setContext(lc); sa.setSyslogHost("localhost"); sa.setFacility("MAIL"); - sa.setPort(MockSyslogServer.PORT); + sa.setPort(port); sa.start(); assertTrue(sa.isStarted()); @@ -68,8 +72,11 @@ } public void testExceptoin() throws InterruptedException { - MockSyslogServer mockServer = new MockSyslogServer(1); + int port = MockSyslogServer.PORT+2; + MockSyslogServer mockServer = new MockSyslogServer(1, port); mockServer.start(); + // give MockSyslogServer head start + Thread.sleep(100); LoggerContext lc = new LoggerContext(); lc.setName("test"); @@ -77,7 +84,7 @@ sa.setContext(lc); sa.setSyslogHost("localhost"); sa.setFacility("MAIL"); - sa.setPort(MockSyslogServer.PORT); + sa.setPort(port); sa.start(); assertTrue(sa.isStarted());

1 0

svn commit: r525 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Thu Sep 7 22:41:05 2006 New Revision: 525 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Log: attepting to solve problems on Linux Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java Thu Sep 7 22:41:05 2006 @@ -39,12 +39,13 @@ @Override public void run() { - ObjectInputStream ois; + ObjectInputStream ois = null; + ServerSocket serverSocket = null; //Object readObject; LoggingEvent event; try { //System.out.println("Listening on port " + PORT); - ServerSocket serverSocket = new ServerSocket(PORT); + serverSocket = new ServerSocket(PORT); //System.out.println("Waiting to accept a new client."); Socket socket = serverSocket.accept(); //System.out.println("Connected to client at " + socket.getInetAddress()); @@ -56,11 +57,17 @@ // System.out.println("* Context Name: " + event.getLogger().getLoggerContext().getName()); loggingEventList.add(event); } - ois.close(); - serverSocket.close(); } catch (Exception se) { se.printStackTrace(); - } + } finally { + + if(ois != null) { + try{ois.close(); } catch(Exception e) {} + } + if(serverSocket != null) { + try{ serverSocket.close(); } catch(Exception e) {} + } + } finished = true; } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java Thu Sep 7 22:41:05 2006 @@ -39,9 +39,11 @@ socket = new DatagramSocket(PORT); for (int i = 0; i < loopLen; i++) { - byte[] buf = new byte[1024]; + byte[] buf = new byte[2048]; DatagramPacket packet = new DatagramPacket(buf, buf.length); + System.out.println("Waiting for message"); socket.receive(packet); + System.out.println("Got message"); String msg = new String(buf, 0, packet.getLength()); msgList.add(msg); } @@ -49,7 +51,7 @@ se.printStackTrace(); } finally { if(socket != null) { - socket.close(); + try {socket.close();} catch(Exception e) {} } } finished = true; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Thu Sep 7 22:41:05 2006 @@ -52,7 +52,7 @@ // wait max 2 seconds for mock server to finish. However, it should // much sooner than that. - mockServer.join(2000); + mockServer.join(8000); assertTrue(mockServer.finished); assertEquals(1, mockServer.msgList.size()); String msg = mockServer.msgList.get(0); @@ -90,7 +90,7 @@ // wait max 2 seconds for mock server to finish. However, it should // much sooner than that. - mockServer.join(2000); + mockServer.join(8000); assertTrue(mockServer.finished); assertEquals(1, mockServer.msgList.size()); String msg = mockServer.msgList.get(0);

1 0

svn commit: r524 - logback/trunk/logback-classic
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Thu Sep 7 21:19:28 2006 New Revision: 524 Modified: logback/trunk/logback-classic/pom.xml Log: SerializationPerfsTest should not be run automatically by Maven because it requires ExternalMockSocketServer. Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Thu Sep 7 21:19:28 2006 @@ -88,6 +88,7 @@ <excludes> <exclude>**/AllTest.java</exclude> <exclude>**/PackageTest.java</exclude> + <exclude>**/SerializationPerfsTest.java</exclude> </excludes> </configuration> </plugin>

1 0

svn commit: r523 - in logback/trunk: . logback-classic/src/main/java/ch/qos/logback/classic logback-classic/src/test/java/ch/qos/logback/classic logback-core/src/main/java/ch/qos/logback/core/rolling logback-core/src/main/java/ch/qos/logback/core/rolling/helper logback-site/src/site/fml
by noreply.ceki＠qos.ch 07 Sep '06

07 Sep '06

Author: ceki Date: Thu Sep 7 21:07:49 2006 New Revision: 523 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java logback/trunk/logback-site/src/site/fml/ logback/trunk/logback-site/src/site/fml/codes.fml Modified: logback/trunk/ (props changed) logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java Log: Added MDC support Minor bug fixes Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java Thu Sep 7 21:07:49 2006 @@ -0,0 +1,105 @@ +package ch.qos.logback.classic; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * A Mapped Diagnostic Context, or MDC in short, is an instrument for + * distinguishing interleaved log output from different sources. Log output is + * typically interleaved when a server handles multiple clients + * near-simultaneously. + * + * The MDC is managed on a per thread basis. A child thread + * automatically inherits a copy of the mapped diagnostic context of + * its parent. + * + * + * @author Ceki Gülcü + */ +public class MDC { + private static final ThreadLocal<HashMap<String, String>> threadLocal = new ThreadLocal<HashMap<String, String>>(); + + private MDC() { + } + + /** + * Put a context value (the <code>val</code> parameter) as identified with + * the <code>key</code> parameter into the current thread's context map. + * + * + * If the current thread does not have a context map it is created as a side + * effect of this call. + */ + public static void put(String key, String val) { + HashMap<String, String> hashMap = threadLocal.get(); + + if (hashMap == null) { + hashMap = new HashMap<String, String>(); + threadLocal.set(hashMap); + } + + hashMap.put(key, val); + } + + /** + * Get the context identified by the <code>key</code> parameter. + * + * + * This method has no side effects. + */ + public static String get(String key) { + HashMap<String, String> hashMap = threadLocal.get(); + + if ((hashMap != null) && (key != null)) { + return hashMap.get(key); + } else { + return null; + } + } + + /** + * Remove the the context identified by the <code>key</code> parameter. + */ + public static void remove(String key) { + HashMap<String, String> hashMap = threadLocal.get(); + + if (hashMap != null) { + hashMap.remove(key); + } + } + + /** + * Clear all entries in the MDC. + */ + public static void clear() { + HashMap<String, String> hashMap = threadLocal.get(); + + if (hashMap != null) { + hashMap.clear(); + threadLocal.remove(); + } + } + + /** + * Get the current thread's MDC as a map. This method is intended to be used + * internally. + */ + public static Map<String, String> getContext() { + return threadLocal.get(); + } + + /** + * Returns the keys in the MDC as a {@link Set}. The returned value + * can be null. + */ + public static Set<String> getKeys() { + HashMap<String, String> hashMap = threadLocal.get(); + + if (hashMap != null) { + return hashMap.keySet(); + } else { + return null; + } + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java Thu Sep 7 21:07:49 2006 @@ -0,0 +1,49 @@ +package ch.qos.logback.classic; + +import junit.framework.TestCase; + +public class MDCTest extends TestCase { + + + public void test() throws InterruptedException { + TestThread threadA = new TestThread("a"); + threadA.start(); + + TestThread threadB = new TestThread("b"); + threadB.start(); + + threadA.join(); + threadB.join(); + + + assertNull(threadA.x0); + assertEquals("a", threadA.x1); + assertNull(threadA.x2); + + assertNull(threadB.x0); + assertEquals("b", threadB.x1); + assertNull(threadB.x2); + + } + +} + +class TestThread extends Thread { + + String val; + TestThread(String val) { + this.val = val; + } + String x0; + String x1; + String x2; + + public void run() { + x0 = MDC.get("x"); + MDC.put("x", val); + x1 = MDC.get("x"); + MDC.clear(); + x2 = MDC.get("x"); + System.out.println("Exiting "+val); + } +} \ No newline at end of file Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java Thu Sep 7 21:07:49 2006 @@ -123,7 +123,7 @@ static final String FNP_NOT_SET = "The FileNamePattern option must be set before using TimeBasedRollingPolicy. "; static final String SEE_FNP_NOT_SET = - "See also http://www.logback.com/doc/codes.html#tbr_fnp_not_set"; + "See also http://logback.qos.ch/doc/codes.html#tbr_fnp_not_set"; RollingCalendar rc; long nextCheck; Date lastCheck = new Date(); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java Thu Sep 7 21:07:49 2006 @@ -201,6 +201,7 @@ case TOP_OF_WEEK: this.set(Calendar.DAY_OF_WEEK, getFirstDayOfWeek()); this.set(Calendar.HOUR_OF_DAY, 0); + this.set(Calendar.MINUTE, 0); this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.WEEK_OF_YEAR, 1); @@ -210,6 +211,7 @@ case TOP_OF_MONTH: this.set(Calendar.DATE, 1); this.set(Calendar.HOUR_OF_DAY, 0); + this.set(Calendar.MINUTE, 0); this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.MONTH, 1); Added: logback/trunk/logback-site/src/site/fml/codes.fml ============================================================================== --- (empty file) +++ logback/trunk/logback-site/src/site/fml/codes.fml Thu Sep 7 21:07:49 2006 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="iso-8859-1"?> + +<document> + + <body> + + <faqs title="Logback error messages and their meanings"> + + <part id="Generalities"> + <title>Generalities</title> + + <faq id="tbr_fnp_not_set"> + + <question>The FileNamePattern option must be set before + using <code>TimeBasedRollingPolicy</code> or + <code>FixedWindowRollingPolicy</code>. + </question> + + <answer> + The FileNamePattern option for both + <code>TimeBasedRollingPolicy</code> and + <code>FixedWindowRollingPolicy</code> is mandatory. + + </answer> + + </faq> + </part> + </faqs> + </body> +</document>

1 0

svn commit: r522 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/rolling test/java/ch/qos/logback/core test/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 07 Sep '06

07 Sep '06

Author: seb Date: Thu Sep 7 18:58:28 2006 New Revision: 522 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicyTest.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TriggeringPolicyBase.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/AllTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Log: - modified maxFileSize attribute type to String - added maxFileSizeAsLong attribute - updated tests and package tests - created a test for the StringToLong method Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java Thu Sep 7 18:58:28 2006 @@ -26,27 +26,59 @@ */ public static final long DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024; // 10 MB - long maxFileSize = DEFAULT_MAX_FILE_SIZE; + String maxFileSize = Long.toString(DEFAULT_MAX_FILE_SIZE); + long maxFileSizeAsLong; public SizeBasedTriggeringPolicy() { } - public SizeBasedTriggeringPolicy(final long maxFileSize) { - this.maxFileSize = maxFileSize; + public SizeBasedTriggeringPolicy(final String maxFileSize) { + setMaxFileSize(maxFileSize); } - public boolean isTriggeringEvent(final File file, final Object event) { //System.out.println("Size"+file.length()); - return (file.length() >= maxFileSize); + return (file.length() >= maxFileSizeAsLong); } - public long getMaxFileSize() { + public String getMaxFileSize() { return maxFileSize; } - public void setMaxFileSize(long l) { - maxFileSize = l; + public void setMaxFileSize(String maxFileSize) { + this.maxFileSize = maxFileSize; + this.maxFileSizeAsLong = toFileSize(maxFileSize); } + long toFileSize(String value) { + if(value == null) + return DEFAULT_MAX_FILE_SIZE; + + String s = value.trim().toUpperCase(); + long multiplier = 1; + int index; + + if((index = s.indexOf("KB")) != -1) { + multiplier = 1024; + s = s.substring(0, index); + } + else if((index = s.indexOf("MB")) != -1) { + multiplier = 1024*1024; + s = s.substring(0, index); + } + else if((index = s.indexOf("GB")) != -1) { + multiplier = 1024*1024*1024; + s = s.substring(0, index); + } + if(s != null) { + try { + return Long.valueOf(s).longValue() * multiplier; + } + catch (NumberFormatException e) { + addError("[" + s + "] is not in proper int form."); + addError("[" + value + "] not in expected format.", e); + } + } + return DEFAULT_MAX_FILE_SIZE; + } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TriggeringPolicyBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TriggeringPolicyBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TriggeringPolicyBase.java Thu Sep 7 18:58:28 2006 @@ -10,6 +10,8 @@ package ch.qos.logback.core.rolling; +import ch.qos.logback.core.spi.ContextAwareBase; + /** * SizeBasedTriggeringPolicy looks at size of the file being @@ -18,7 +20,7 @@ * @author Ceki Gülcü * */ -abstract public class TriggeringPolicyBase implements TriggeringPolicy { +abstract public class TriggeringPolicyBase extends ContextAwareBase implements TriggeringPolicy { private boolean start; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/AllTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/AllTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/AllTest.java Thu Sep 7 18:58:28 2006 @@ -14,6 +14,7 @@ suite.addTest(ch.qos.logback.core.pattern.AllTest.suite()); suite.addTest(ch.qos.logback.core.appender.PackageTest.suite()); suite.addTest(ch.qos.logback.core.rolling.helper.PackageTest.suite()); + suite.addTest(ch.qos.logback.core.rolling.PackageTest.suite()); suite.addTest(ch.qos.logback.core.joran.spi.PackageTest.suite()); return suite; } Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java Thu Sep 7 18:58:28 2006 @@ -0,0 +1,16 @@ +package ch.qos.logback.core.rolling; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class PackageTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(RenamingTest.class); + suite.addTestSuite(SizeBasedRollingTest.class); + suite.addTestSuite(TimeBasedRollingTest.class); + return suite; + } +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Thu Sep 7 18:58:28 2006 @@ -21,6 +21,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.Layout; import ch.qos.logback.core.layout.DummyLayout; import ch.qos.logback.core.util.Compare; @@ -29,9 +31,10 @@ /** * - * Do not forget to call activateOptions when configuring programatically. + * Do not forget to call start() when configuring programatically. * * @author Ceki Gülcü + * @author Sébastien Pennec * */ public class SizeBasedRollingTest extends TestCase { @@ -42,14 +45,14 @@ public void setUp() { { - File target = new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.log"); - target.mkdirs(); - target.delete(); + File target = new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.log"); + target.mkdirs(); + target.delete(); } { - File target = new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); - target.mkdirs(); - target.delete(); + File target = new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); + target.mkdirs(); + target.delete(); } } @@ -63,13 +66,18 @@ public void test1() throws Exception { // We purposefully use the \n as the line separator. // This makes the regression test system independent. + Context context = new ContextBase(); Layout layout = new DummyLayout(); RollingFileAppender rfa = new RollingFileAppender(); rfa.setLayout(layout); + rfa.setContext(new ContextBase()); FixedWindowRollingPolicy fwrp = new FixedWindowRollingPolicy(); + fwrp.setContext(context); SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy(); - sbtp.setMaxFileSize(100); + sbtp.setContext(context); + + sbtp.setMaxFileSize("100"); sbtp.start(); fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/sizeBased-test1.%i"); try { @@ -78,22 +86,28 @@ } catch (IllegalStateException e) { return; } + + //StatusPrinter.print(context.getStatusManager()); } /** * Test basic rolling functionality. */ public void test2() throws Exception { - + Context context = new ContextBase(); + DummyLayout layout = new DummyLayout(); RollingFileAppender rfa = new RollingFileAppender(); rfa.setName("ROLLING"); rfa.setLayout(layout); - + rfa.setContext(context); + FixedWindowRollingPolicy swrp = new FixedWindowRollingPolicy(); + swrp.setContext(context); SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy(); + sbtp.setContext(context); - sbtp.setMaxFileSize(100); + sbtp.setMaxFileSize("100"); swrp.setMinIndex(0); swrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.log"); @@ -136,20 +150,26 @@ assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.1", Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.1")); } + + //StatusPrinter.print(context.getStatusManager()); } /** * Same as testBasic but also with GZ compression. */ public void test3() throws Exception { + Context context = new ContextBase(); DummyLayout layout = new DummyLayout(); RollingFileAppender rfa = new RollingFileAppender(); rfa.setLayout(layout); - + rfa.setContext(context); + FixedWindowRollingPolicy fwrp = new FixedWindowRollingPolicy(); + fwrp.setContext(context); SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy(); - - sbtp.setMaxFileSize(100); + sbtp.setContext(context); + + sbtp.setMaxFileSize("100"); fwrp.setMinIndex(0); fwrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/sbr-test3.%i.gz"); @@ -189,6 +209,7 @@ Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.1.gz")); } + //StatusPrinter.print(context.getStatusManager()); } boolean isWindows() { Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicyTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicyTest.java Thu Sep 7 18:58:28 2006 @@ -0,0 +1,44 @@ +package ch.qos.logback.core.rolling; + +import junit.framework.TestCase; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; + +public class SizeBasedTriggeringPolicyTest extends TestCase { + + public void testStringToLong() { + Context context = new ContextBase(); + SizeBasedTriggeringPolicy policy = new SizeBasedTriggeringPolicy(); + policy.setContext(context); + + Long result; + + { + result = policy.toFileSize("123"); + assertEquals(new Long("123"), result); + } + { + result = policy.toFileSize("123KB"); + // = 123 * 1024 + assertEquals(new Long("125952"), result); + } + { + result = policy.toFileSize("123MB"); + // = 123 * 1024 * 1024 + assertEquals(new Long("128974848"), result); + } + { + result = policy.toFileSize("123GB"); + // = 123 * 1024 * 1024 * 1024 + assertEquals(new Long("132070244352"), result); + } + + { + result = policy.toFileSize("123xxxx"); + // = 123 * 1024 * 1024 * 1024 + assertEquals(new Long(SizeBasedTriggeringPolicy.DEFAULT_MAX_FILE_SIZE), result); + assertEquals(2, context.getStatusManager().getCount()); + } + + } +}

1 0