OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a property name that does not imply it is only about tasks logging

Browse Source 
When indeed it is not only about those.
This commit is contained in:
Baptiste Mathus committed 2018-03-27 14:42:59 +02:00
1 parent 34f9586f5e
commit c50d808de1
2 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/triggers/SafeTimerTask.java
+4 -4
View File
@@ -52,11 +52,11 @@ import org.acegisecurity.context.SecurityContextHolder;
public abstract class SafeTimerTask extends TimerTask {
/**
* System property to change the location where tasks logging should be sent.
* System property to change the location where (tasks) logging should be sent.
* <p><strong>Beware: changing it while Jenkins is running gives no guarantee logs will be sent to the new location
* until it is restarted.</strong></p>
*/
static final String TASKS_LOGS_ROOT_PATH_PROPERTY = SafeTimerTask.class.getName()+".TASKS_LOGS_ROOT_PATH";
static final String LOGS_ROOT_PATH_PROPERTY = SafeTimerTask.class.getName()+".logsTargetDir";
public final void run() {
// background activity gets system credential,
@@ -83,13 +83,13 @@ public abstract class SafeTimerTask extends TimerTask {
* @since TODO
*/
public static File getLogsRoot() {
String tagsLogsPath = SystemProperties.getString(TASKS_LOGS_ROOT_PATH_PROPERTY);
String tagsLogsPath = SystemProperties.getString(LOGS_ROOT_PATH_PROPERTY);
if (tagsLogsPath == null) {
return new File(Jenkins.get().getRootDir(), "logs");
} else {
LOGGER.log(Level.INFO,
"Using non default root path for tasks logging: {0}. (Beware: no automated migration if you change or remove it again)",
TASKS_LOGS_ROOT_PATH_PROPERTY);
LOGS_ROOT_PATH_PROPERTY);
return new File(tagsLogsPath);
}
}
test/src/test/java/hudson/triggers/SafeTimerTaskTest.java
+3 -3
View File
@@ -31,13 +31,13 @@ public class SafeTimerTaskTest {
@After
public void tearDown() throws Exception {
System.clearProperty(SafeTimerTask.TASKS_LOGS_ROOT_PATH_PROPERTY);
System.clearProperty(SafeTimerTask.LOGS_ROOT_PATH_PROPERTY);
}
@Issue("JENKINS-50291")
@Test
public void changeLogsRoot() throws Exception {
assertNull(System.getProperty(SafeTimerTask.TASKS_LOGS_ROOT_PATH_PROPERTY));
assertNull(System.getProperty(SafeTimerTask.LOGS_ROOT_PATH_PROPERTY));
File temporaryFolder = folder.newFolder();
@@ -50,7 +50,7 @@ public class SafeTimerTaskTest {
assertTrue(logsRoot.exists());
assertTrue(logsRoot.isDirectory());
System.setProperty(SafeTimerTask.TASKS_LOGS_ROOT_PATH_PROPERTY, temporaryFolder.toString());
System.setProperty(SafeTimerTask.LOGS_ROOT_PATH_PROPERTY, temporaryFolder.toString());
assertEquals(temporaryFolder.toString(), SafeTimerTask.getLogsRoot().toString());
}