github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: while cycles cause high cpu usage (#2663) 

#### What type of PR is this?
/kind bug
/area core
/milestone 2.0
#### What this PR does / why we need it:
修复日志 while 循环导致 cpu 占用高的问题

#### Special notes for your reviewer:
/cc @halo-dev/sig-halo 
#### Does this PR introduce a user-facing change?

```release-note
None
```
pull/2669/head
guqing 2022-11-07 11:54:11 +08:00 committed by GitHub
parent 9b4ed96e2a
commit f22a401092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/run/halo/app/metrics/VisitLogWriter.java
View File

@ -7,12 +7,13 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.time.Instant;
import java.util.Queue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.atomic.AtomicInteger;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
@ -51,11 +52,7 @@ public class VisitLogWriter implements InitializingBean, DisposableBean {
}
public void log(String logMsg) {
try {
asyncLogWriter.put(logMsg);
} catch (InterruptedException e) {
log.error("Failed to log visit log: {}", ExceptionUtils.getStackTrace(e));
}
asyncLogWriter.put(logMsg);
}
public Path getLogFilePath() {
@ -74,7 +71,7 @@ public class VisitLogWriter implements InitializingBean, DisposableBean {
asyncLogWriter.writeLog();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
log.info("VisitLogWrite thread [{}] interrupted",
log.warn("VisitLogWrite thread [{}] interrupted",
Thread.currentThread().getName());
}
}
@ -106,7 +103,7 @@ public class VisitLogWriter implements InitializingBean, DisposableBean {
private static final int MAX_LOG_SIZE = 10000;
private static final int BATCH_SIZE = 10;
private final BufferedOutputStream writer;
private final Queue<String> logQueue;
private final BlockingQueue<String> logQueue;
private final AtomicInteger logBatch = new AtomicInteger(0);
private volatile boolean disposed = false;
@ -124,15 +121,15 @@ public class VisitLogWriter implements InitializingBean, DisposableBean {
}
public void writeLog() throws InterruptedException {
if (logQueue.isEmpty()) {
String logMessage = logQueue.take();
if (StringUtils.isBlank(logMessage)) {
return;
}
String logMessage = logQueue.poll();
writeToDisk(logMessage);
log.debug("Consumption visit log message: [{}]", logMessage);
}
void writeToDisk(String logMsg) throws InterruptedException {
void writeToDisk(String logMsg) {
String format = String.format("%s %s\n", Instant.now(), logMsg);
try {
writer.write(format.getBytes(), 0, format.length());
@ -146,10 +143,10 @@ public class VisitLogWriter implements InitializingBean, DisposableBean {
}
}
public void put(String logMessage) throws InterruptedException {
public void put(String logMessage) {
// add log message to queue tail
logQueue.add(logMessage);
log.info("Production a log messages [{}]", logMessage);
log.debug("Production a log messages [{}]", logMessage);
}
@Override