### Eclipse Workspace Patch 1.0 #P tomcat-7.0.x Index: java/org/apache/juli/FileHandler.java =================================================================== --- java/org/apache/juli/FileHandler.java (revision 937651) +++ java/org/apache/juli/FileHandler.java (working copy) @@ -95,6 +95,12 @@ /** + * Determines whether the logfile is rotatable + */ + private boolean rotatable = true; + + + /** * The PrintWriter to which we are currently logging, if any. */ private volatile PrintWriter writer = null; @@ -134,7 +140,7 @@ writerLock.readLock().lock(); // If the date has changed, switch log files - if (!date.equals(tsDate)) { + if (rotatable && !date.equals(tsDate)) { // Update to writeLock before we switch writerLock.readLock().unlock(); writerLock.writeLock().lock(); @@ -245,6 +251,7 @@ ClassLoader cl = Thread.currentThread().getContextClassLoader(); // Retrieve configuration of logging file name + rotatable = Boolean.parseBoolean(getProperty(className + ".rotatable", "true")); if (directory == null) directory = getProperty(className + ".directory", "logs"); if (prefix == null) @@ -326,7 +333,7 @@ writerLock.writeLock().lock(); try { String pathname = dir.getAbsolutePath() + File.separator + - prefix + date + suffix; + prefix + (rotatable ? date : "") + suffix; String encoding = getEncoding(); FileOutputStream fos = new FileOutputStream(pathname, true); OutputStream os = bufferSize>0?new BufferedOutputStream(fos,bufferSize):fos;