Merge remote branch 'origin/finer_grained_file_locks'

a5an0 · Jan 6, 2011 · c0bf9b3 · c0bf9b3
2 parents bb6c36f + 57e63ee
commit c0bf9b3
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/main/scala/net/lag/logging/FileHandler.scala b/src/main/scala/net/lag/logging/FileHandler.scala
@@ -135,7 +135,7 @@ class FileHandler(val filename: String, val policy: Policy, formatter: Formatter
     }
   }
 
-  def roll() = {
+  def roll() = synchronized {
     stream.close()
     val n = filename.lastIndexOf('.')
     val newFilename = if (n > 0) {
@@ -148,13 +148,18 @@ class FileHandler(val filename: String, val policy: Policy, formatter: Formatter
     removeOldFiles()
   }
 
-  def publish(record: javalog.LogRecord) = synchronized {
+  def publish(record: javalog.LogRecord) = {
     try {
-      if (System.currentTimeMillis > nextRollTime) {
-        roll
+      synchronized {
+        if (System.currentTimeMillis > nextRollTime) {
+          roll
+        }
+      }
+      val formattedLine = getFormatter.format(record)
+      synchronized {
+        stream.write(formattedLine)
+        stream.flush
       }
-      stream.write(getFormatter.format(record))
-      stream.flush
     } catch {
       case e =>
         System.err.println(Formatter.formatStackTrace(e, 30).mkString("\n"))