(OFBIZ-8341) In many Java and Groovy files we have auto generated catch blocks or empty catch blocks. To avoid such exception swallowing this should be improved to at least log the error and also return error in case of service. Here we use 3 try-with-ressource blocks and log some errors git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866957 13f79535-47bb-0310-9956-ffa450edef68
72 lines
2.6 KiB
Groovy
72 lines
2.6 KiB
Groovy
/*
|
|
* Licensed to the Apache Software Foundation (ASF) under one
|
|
* or more contributor license agreements. See the NOTICE file
|
|
* distributed with this work for additional information
|
|
* regarding copyright ownership. The ASF licenses this file
|
|
* to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing,
|
|
* software distributed under the License is distributed on an
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the
|
|
* specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
|
|
import org.apache.ofbiz.base.util.FileUtil
|
|
import org.apache.ofbiz.base.util.UtilProperties
|
|
|
|
String ofbizLogDir = UtilProperties.getPropertyValue("debug", "log4j.appender.css.dir", "runtime/logs/")
|
|
if (!ofbizLogDir.startsWith("/")) {
|
|
ofbizLogDir = System.getProperty("ofbiz.home") + "/" + ofbizLogDir
|
|
}
|
|
if (!ofbizLogDir.endsWith("/")) {
|
|
ofbizLogDir = ofbizLogDir.concat("/")
|
|
}
|
|
|
|
File runTimeLogDir = FileUtil.getFile(ofbizLogDir)
|
|
File[] listLogFiles = runTimeLogDir.listFiles()
|
|
String ofbizLogRegExp = UtilProperties.getPropertyValue("debug", "log4j.appender.css.fileNameRegExp", "[(ofbiz)|(error)].*")
|
|
List listLogFileNames = []
|
|
for (int i = 0; i < listLogFiles.length; i++) {
|
|
if (listLogFiles[i].isFile()) {
|
|
logFileName = listLogFiles[i].getName()
|
|
if (logFileName.matches(ofbizLogRegExp)) {
|
|
listLogFileNames.add(logFileName)
|
|
}
|
|
}
|
|
}
|
|
context.listLogFileNames = listLogFileNames.sort()
|
|
|
|
if (parameters.logFileName && logFileName.contains(parameters.logFileName)) {
|
|
List logLines = []
|
|
try {
|
|
File logFile = FileUtil.getFile(ofbizLogDir.concat(parameters.logFileName))
|
|
logFile.eachLine { line ->
|
|
if (parameters.searchString) {
|
|
if (!line.contains(parameters.searchString)) {
|
|
return
|
|
}
|
|
}
|
|
type = ''
|
|
if (line.contains(" |I| ")) {
|
|
type = 'INFO'
|
|
} else if (line.contains(" |W| ")) {
|
|
type = 'WARN'
|
|
} else if (line.contains(" |E| ")) {
|
|
type = 'ERROR'
|
|
} else if (line.contains(" |D| ")) {
|
|
type = 'DEBUG'
|
|
}
|
|
logLines.add([type: type, line:line])
|
|
}
|
|
} catch (Exception e) {
|
|
Debug.logError(e, "FetchLogs.groovy");
|
|
}
|
|
context.logLines = logLines
|
|
}
|