hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-13 21:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: set default configFile

Browse Source 
(cherry picked from commit a5e8d7aa15)
This commit is contained in:
igorbaptist4
2024-09-10 13:10:14 -03:00
committed by github-actions[bot]
parent 09a4da7bff
commit d2ab46b0ae
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
View File

@@ -281,10 +281,14 @@ public class LogAnalyser {
*/ */
private static String fileTemplate = "dspace\\.log.*"; private static String fileTemplate = "dspace\\.log.*";
private static final ConfigurationService configurationService =
DSpaceServicesFactory.getInstance().getConfigurationService();
/** /**
* the configuration file from which to configure the analyser * the configuration file from which to configure the analyser
*/ */
private static String configFile; private static String configFile = configurationService.getProperty("dspace.dir")
+ File.separator + "config" + File.separator + "dstat.cfg";
/** /**
* the output file to which to write aggregation data * the output file to which to write aggregation data
@@ -616,8 +620,6 @@ public class LogAnalyser {
} }
// now do the host name and url lookup // now do the host name and url lookup
ConfigurationService configurationService
= DSpaceServicesFactory.getInstance().getConfigurationService();
hostName = Utils.getHostName(configurationService.getProperty("dspace.ui.url")); hostName = Utils.getHostName(configurationService.getProperty("dspace.ui.url"));
name = configurationService.getProperty("dspace.name").trim(); name = configurationService.getProperty("dspace.name").trim();
url = configurationService.getProperty("dspace.ui.url").trim(); url = configurationService.getProperty("dspace.ui.url").trim();
@@ -658,8 +660,6 @@ public class LogAnalyser {
String myConfigFile, String myOutFile, String myConfigFile, String myOutFile,
Date myStartDate, Date myEndDate, Date myStartDate, Date myEndDate,
boolean myLookUp) { boolean myLookUp) {
ConfigurationService configurationService
= DSpaceServicesFactory.getInstance().getConfigurationService();
if (myLogDir != null) { if (myLogDir != null) {
logDir = myLogDir; logDir = myLogDir;
@@ -673,9 +673,6 @@ public class LogAnalyser {
if (myConfigFile != null) { if (myConfigFile != null) {
configFile = myConfigFile; configFile = myConfigFile;
} else {
configFile = configurationService.getProperty("dspace.dir")
+ File.separator + "config" + File.separator + "dstat.cfg";
} }
if (myStartDate != null) { if (myStartDate != null) {