SRSoftware/OpenCloudCal
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

made loglevels configurable

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-01-03 11:57:45 +01:00
parent 0102ba9f11
commit 172369f799
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
de.srsoftware.cal.app/build.gradle.kts
View File

@@ -16,4 +16,5 @@ dependencies {
implementation("de.srsoftware:tools.util:1.3.0") implementation("de.srsoftware:tools.util:1.3.0")
implementation("de.srsoftware:tools.web:1.3.14") implementation("de.srsoftware:tools.web:1.3.14")
implementation("com.mysql:mysql-connector-j:9.1.0") implementation("com.mysql:mysql-connector-j:9.1.0")
implementation("org.json:json:20240303")
} }

31
de.srsoftware.cal.app/src/main/java/de/srsoftware/cal/app/Application.java
View File

@@ -14,6 +14,8 @@ import de.srsoftware.configuration.Configuration;
import de.srsoftware.configuration.JsonConfig; import de.srsoftware.configuration.JsonConfig;
import de.srsoftware.tools.ColorLogger; import de.srsoftware.tools.ColorLogger;
import de.srsoftware.tools.plugin.JarWatchdog; import de.srsoftware.tools.plugin.JarWatchdog;
import org.json.JSONObject;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
@@ -52,10 +54,10 @@ public class Application {
*/ */
public static void main(String[] args) throws IOException, SQLException { public static void main(String[] args) throws IOException, SQLException {
LOG.log(INFO, "Starting application…"); LOG.log(INFO, "Starting application…");
ColorLogger.setRootLogLevel(DEBUG);
ColorLogger.setLogLevel("jdk.event.security",INFO);
ColorLogger.setLogLevel("sun.net.www.protocol.http.HttpURLConnection",INFO);
JsonConfig jsonConfig = new JsonConfig("OpenCloudCal"); JsonConfig jsonConfig = new JsonConfig("OpenCloudCal");
configureLogging(jsonConfig);
Optional<String> staticPath = jsonConfig.get("opencloudcal.static"); Optional<String> staticPath = jsonConfig.get("opencloudcal.static");
var db = connect(jsonConfig); var db = connect(jsonConfig);
var port = jsonConfig.get("opencloudcal.http.port", 8080); var port = jsonConfig.get("opencloudcal.http.port", 8080);
@@ -75,8 +77,29 @@ public class Application {
.addListener(autoImport) .addListener(autoImport)
.afterScan(autoImport) .afterScan(autoImport)
.start(); .start();
}
// TODO: add importers private static void configureLogging(JsonConfig jsonConfig) {
var rootLevel = jsonConfig.get("opencloudcal.logging.rootlevel", "INFO");
ColorLogger.setRootLogLevel(mapLogLevel(rootLevel));
var loggers = jsonConfig.get("opencloudcal.logging.loggers").orElse(null);
if (loggers instanceof JSONObject json){
json.keySet().forEach(key -> {
var lvl = mapLogLevel(json.getString(key));
ColorLogger.setLogLevel(key,lvl);
});
}
}
private static System.Logger.Level mapLogLevel(String lbl) {
return switch (lbl){
case "ERROR" -> ERROR;
case "WARN" -> WARNING;
case "DEBUG" -> DEBUG;
case "TRACE" -> TRACE;
default ->INFO;
};
} }
} }

4
de.srsoftware.cal.app/src/main/java/de/srsoftware/cal/app/AutoImporter.java
View File

@@ -287,11 +287,11 @@ public class AutoImporter implements Runnable, ClassListener {
@Override @Override
public void classAdded(Class<?> aClass) { public void classAdded(Class<?> aClass) {
if (Importer.class.isAssignableFrom(aClass))) try { if (Importer.class.isAssignableFrom(aClass)) try {
var instance = aClass.getDeclaredConstructor().newInstance(); var instance = aClass.getDeclaredConstructor().newInstance();
importers.add((Importer) instance); importers.add((Importer) instance);
lastImport = null; lastImport = null;
LOG.log(INFO,"Added {0} to the list of importers. Will be used soon…",instance); LOG.log(INFO,"Added {0} to the list of importers. Will be used soon…",aClass.getSimpleName());
} catch (Exception e) { } catch (Exception e) {
LOG.log(WARNING,"Failed to add importer: {0}",aClass.getSimpleName(),e); LOG.log(WARNING,"Failed to add importer: {0}",aClass.getSimpleName(),e);
} }