Skip to content

Commit

Permalink
bugfix: log thread not blocking anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
witek committed Nov 11, 2011
1 parent fef0eda commit b93e4f7
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions src/main/java/ilarkesto/logging/DefaultLogDataHandler.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*
* Copyright 2011 Witoslaw Koczewsi <[email protected]>, Artjom Kochtchi
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option)
* any later version.
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero
* General Public License as published by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
* for more details.
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
Expand Down Expand Up @@ -58,8 +58,8 @@ public void run() {
break;
}
}
LogRecord record = queue.poll(Long.MAX_VALUE, TimeUnit.SECONDS);
System.err.println(record.toString());
LogRecord record = queue.poll(1, TimeUnit.SECONDS);
if (record != null) System.err.println(record.toString());
} catch (InterruptedException ignored) {
shutdown = true;
}
Expand All @@ -82,9 +82,7 @@ public void run() {

public static void stopLogging() {
INSTANCE.flush();
synchronized (Log.class) {
INSTANCE.shutdown = true;
}
INSTANCE.shutdown = true;
if (INSTANCE.sysoutThread != null) INSTANCE.sysoutThread.interrupt();
}

Expand Down

0 comments on commit b93e4f7

Please sign in to comment.