antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 9 Projects Releases 5 Activity Actions

Added a wakeup() method that allows us to ping the Logger thread to resume

Browse source 
running immediately. Also decreased the sleep interval to 250 millis, so logging
output should be more fluent now.
Reformatted innger GZipper class.
This commit is contained in:
hns 2002-11-06 12:07:53 +00:00
parent a080342079
commit fd74552857
1 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/helma/util/Logger.java
View file

@ -280,7 +280,6 @@ public final class Logger {
} }
} }
/** /**
* Return a list of all active Loggers * Return a list of all active Loggers
*/ */
@ -290,6 +289,14 @@ public final class Logger {
return (List) loggers.clone (); return (List) loggers.clone ();
} }
/**
* Notify the runner thread that it should wake up and run.
*/
public static void wakeup () {
if (runner != null)
runner.wakeup ();
}
private static void rotateAllLogs () { private static void rotateAllLogs () {
int nloggers = loggers.size(); int nloggers = loggers.size();
for (int i=nloggers-1; i>=0; i--) { for (int i=nloggers-1; i>=0; i--) {
@ -307,7 +314,7 @@ public final class Logger {
*/ */
static class Runner extends Thread { static class Runner extends Thread {
public void run () { public synchronized void run () {
long nextMidnight = nextMidnight (); long nextMidnight = nextMidnight ();
while (runner == this && !isInterrupted ()) { while (runner == this && !isInterrupted ()) {
if (nextMidnight < System.currentTimeMillis ()) { if (nextMidnight < System.currentTimeMillis ()) {
@ -327,43 +334,50 @@ public final class Logger {
System.err.println ("Error in Logger main loop: "+x); System.err.println ("Error in Logger main loop: "+x);
} }
} }
// if there are no active logs, exit logger thread
if (loggers.size() == 0)
return;
try { try {
sleep (500); wait (250);
} catch (InterruptedException ix) {} } catch (InterruptedException ix) {}
} }
} }
public synchronized void wakeup () {
notifyAll ();
}
} }
/** /**
* a Thread class that zips up a file, filename will stay the same. * a Thread class that zips up a file, filename will stay the same.
*/ */
class GZipper extends Thread { class GZipper extends Thread {
File file, temp; File file, temp;
public GZipper (File file) { public GZipper (File file) {
this.file = file; this.file = file;
this.temp = new File (file.getAbsolutePath()+".tmp"); this.temp = new File (file.getAbsolutePath()+".tmp");
} }
public void run() { public void run() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
try { try {
GZIPOutputStream zip = new GZIPOutputStream( new FileOutputStream(temp)); GZIPOutputStream zip = new GZIPOutputStream( new FileOutputStream(temp));
BufferedInputStream in = new BufferedInputStream(new FileInputStream(file)); BufferedInputStream in = new BufferedInputStream(new FileInputStream(file));
byte[] b = new byte[1024]; byte[] b = new byte[1024];
int len = 0; int len = 0;
while( (len=in.read(b,0,1024))!=-1 ) { while( (len=in.read(b,0,1024))!=-1 ) {
zip.write(b,0,len); zip.write(b,0,len);
}
zip.close();
in.close();
file.delete();
temp.renameTo(file);
} catch ( Exception e ) {
System.err.println (e.toString());
} }
zip.close();
in.close();
file.delete();
temp.renameTo(file);
} catch ( Exception e ) {
System.err.println (e.toString());
} }
} }
}
public static long nextMidnight () { public static long nextMidnight () {