Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Log file size and count handling #277

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Upgrade Log file size and count handling #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../main/java/com/newrelic/agent/security/intcodeagent/filelogging/FileLoggerThreadPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class FileLoggerThreadPool {

private boolean isInitLoggingActive = true;

protected final int maxfilesize;
protected final long maxfilesize;

protected final int maxfiles;

Expand All @@ -32,8 +32,8 @@ private FileLoggerThreadPool() throws IOException {
int maxPoolSize = 1;
int corePoolSize = 1;
long keepAliveTime = 600;
maxfiles = Math.max(K2JALogProperties.maxfiles, LogFileHelper.logFileCount());
maxfilesize = LogFileHelper.logFileLimit()*1024;
maxfiles = LogFileHelper.logFileCount();
maxfilesize = LogFileHelper.logFileLimit()* 1024L;

TimeUnit timeUnit = TimeUnit.SECONDS;

Expand Down
4 changes: 3 additions & 1 deletion ...ent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/InitLogWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ public void run() {
FileLoggerThreadPool.getInstance().setInitLoggingActive(true);

// writer.newLine();
rollover(currentLogFileName);
if(maxFileSize > 0) {
rollover(currentLogFileName);
}
} catch (IOException e) {
//TODO report to cloud
FileLoggerThreadPool.getInstance().setInitLoggingActive(false);
Expand Down
18 changes: 13 additions & 5 deletions ...ent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/LogFileHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,32 +37,40 @@ public class LogFileHelper {

public static final String LOG_LIMIT = "log_limit_in_kbytes";
public static final boolean DEFAULT_LOG_DAILY = false;
public static final int DEFAULT_LOG_FILE_COUNT = 1;
public static final Integer DEFAULT_LOG_FILE_COUNT = 1;
public static final String DEFAULT_LOG_FILE_NAME = "java-security-collector.log";

public static final String STDOUT = "STDOUT";

private static final String STRING_DOT = ".";
private static final Integer DEFAULT_LOG_FILE_LIMIT = 0;

public static boolean isLoggingToStdOut() {
String logFileName = NewRelic.getAgent().getConfig().getValue(LogFileHelper.LOG_FILE_NAME, LogFileHelper.DEFAULT_LOG_FILE_NAME);
return StringUtils.equalsIgnoreCase(logFileName, STDOUT);
}

public static int logFileCount() {
return Math.max(1, NewRelic.getAgent().getConfig().getValue(LogFileHelper.LOG_FILE_COUNT, LogFileHelper.DEFAULT_LOG_FILE_COUNT));
try {
return NewRelic.getAgent().getConfig().getValue(LogFileHelper.LOG_FILE_COUNT, LogFileHelper.DEFAULT_LOG_FILE_COUNT);
} catch (Exception e) {
return LogFileHelper.DEFAULT_LOG_FILE_COUNT;
}
}

public static int logFileLimit() {
int size = NewRelic.getAgent().getConfig().getValue(LogFileHelper.LOG_LIMIT, 1);
return size>1?size: K2JALogProperties.maxfilesize;
try {
return NewRelic.getAgent().getConfig().getValue(LogFileHelper.LOG_LIMIT, DEFAULT_LOG_FILE_LIMIT);
} catch (Exception e) {
return DEFAULT_LOG_FILE_LIMIT;
}
}

public static boolean isDailyRollover() {
return NewRelic.getAgent().getConfig().getValue(LogFileHelper.LOG_DAILY, LogFileHelper.DEFAULT_LOG_DAILY);
}

public static void deleteRolloverLogFiles(String fileName, int max) {
public static void deleteRolloverLogFiles(String fileName, long max) {
Collection<File> rolloverLogFiles = FileUtils.listFiles(new File(OsVariablesInstance.getInstance().getOsVariables().getLogDirectory()), FileFilterUtils.prefixFileFilter(fileName + "."), null);

if (rolloverLogFiles.size() > max) {
Expand Down
4 changes: 3 additions & 1 deletion ...y-agent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/LogWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ public void run() {
FileLoggerThreadPool.getInstance().setLoggingActive(true);

// writer.newLine();
rollover(currentLogFileName);
if(maxFileSize > 0){
rollover(currentLogFileName);
}
} catch (IOException e) {
if (FileLoggerThreadPool.getInstance().isLoggingActive()) {
//TODO report to cloud
Expand Down
Loading