School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* updated Log class to set Log level

Browse Source
This commit is contained in:
lukas-heiligenbrunner
2019-12-03 21:57:13 +01:00
parent 4563b8d407
commit 96e000fccf
6 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.google.protobuf:protobuf-java:3.6.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__mysql_mysql_connector_java_8_0_18.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: mysql:mysql-connector-java:8.0.18">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.18/mysql-connector-java-8.0.18.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.18/mysql-connector-java-8.0.18-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.18/mysql-connector-java-8.0.18-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_2.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.2/org.eclipse.paho.client.mqttv3-1.2.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.2/org.eclipse.paho.client.mqttv3-1.2.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.2/org.eclipse.paho.client.mqttv3-1.2.2-sources.jar!/" />
</SOURCES>
</library>
</component>

3
WasteInformationServer.iml
View File

@@ -17,5 +17,8 @@
<orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.2" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.2" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.18" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.18" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" /> <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.2" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.18" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
</component> </component>
</module> </module>

70
src/main/java/com/wasteinformationserver/basicutils/Log.java
View File

@@ -24,57 +24,65 @@ public class Log {
public static final int MESSAGE = 2; public static final int MESSAGE = 2;
public static final int DEBUG = 1; public static final int DEBUG = 1;
private static int Loglevel = 0;
private static ArrayList<String> colors = new ArrayList<String>(Arrays.asList("", "DEBUG", "MESSAGE", "INFO", "WARNING", "ERROR", "CRITICAL_ERROR")); private static ArrayList<String> colors = new ArrayList<String>(Arrays.asList("", "DEBUG", "MESSAGE", "INFO", "WARNING", "ERROR", "CRITICAL_ERROR"));
public static void criticalerror(Object msg) { public static void criticalerror(Object msg) {
log(msg, CRITICAL_ERROR); if (Loglevel <= CRITICAL_ERROR)
log(msg, CRITICAL_ERROR);
} }
public static void error(Object msg) { public static void error(Object msg) {
log(msg, ERROR); if (Loglevel <= ERROR)
log(msg, ERROR);
} }
public static void warning(Object msg) { public static void warning(Object msg) {
log(msg, WARNING); if (Loglevel <= WARNING)
log(msg, WARNING);
} }
public static void info(Object msg) { public static void info(Object msg) {
log(msg, INFO); if (Loglevel <= INFO)
log(msg, INFO);
} }
public static void message(Object msg) { public static void message(Object msg) {
log(msg, MESSAGE); if (Loglevel <= MESSAGE)
log(msg, MESSAGE);
} }
public static void debug(Object msg) { public static void debug(Object msg) {
log(msg, DEBUG); if (Loglevel <= DEBUG)
log(msg, DEBUG);
} }
public static void log(Object msg, int level) { public static void log(Object msg, int level) {
boolean iswindows = System.getProperty("os.name").contains("Windows"); boolean iswindows = System.getProperty("os.name").contains("Windows");
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (!iswindows){ if (!iswindows) {
switch (level) { switch (level) {
case INFO: case INFO:
builder.append(ANSI_CYAN); builder.append(ANSI_CYAN);
break; break;
case WARNING: case WARNING:
builder.append(ANSI_YELLOW); builder.append(ANSI_YELLOW);
break; break;
case ERROR: case ERROR:
builder.append(ANSI_RED); builder.append(ANSI_RED);
break; break;
case CRITICAL_ERROR: case CRITICAL_ERROR:
builder.append(ANSI_RED); builder.append(ANSI_RED);
break; break;
case MESSAGE: case MESSAGE:
builder.append(ANSI_WHITE); builder.append(ANSI_WHITE);
break; break;
case DEBUG: case DEBUG:
builder.append(ANSI_BLUE); builder.append(ANSI_BLUE);
break; break;
} }
} }
builder.append("["); builder.append("[");
@@ -89,14 +97,14 @@ public class Log {
builder.append(colors.get(level)); builder.append(colors.get(level));
builder.append("]"); builder.append("]");
if (!iswindows){ if (!iswindows) {
builder.append(ANSI_WHITE); builder.append(ANSI_WHITE);
} }
builder.append(" - "); builder.append(" - ");
builder.append(msg.toString()); builder.append(msg.toString());
if (!iswindows){ if (!iswindows) {
builder.append(ANSI_RESET); builder.append(ANSI_RESET);
} }
System.out.println(builder.toString()); System.out.println(builder.toString());
@@ -108,4 +116,8 @@ public class Log {
return date_format.format(resultdate); return date_format.format(resultdate);
} }
public static void setLevel(int level) {
Loglevel = level;
}
} }

1
src/main/java/com/wasteinformationserver/main.java
View File

@@ -10,6 +10,7 @@ import java.io.IOException;
public class main { public class main {
public static void main(String[] args) { public static void main(String[] args) {
Log.setLevel(Log.DEBUG);
Runtime.getRuntime().addShutdownHook(new Thread(() -> { Runtime.getRuntime().addShutdownHook(new Thread(() -> {