diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml
new file mode 100644
index 0000000..233670d
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_18.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_18.xml
new file mode 100644
index 0000000..ba9ca1a
--- /dev/null
+++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_18.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_2.xml b/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_2.xml
new file mode 100644
index 0000000..7dce2a4
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WasteInformationServer.iml b/WasteInformationServer.iml
index 9990ff9..379994f 100644
--- a/WasteInformationServer.iml
+++ b/WasteInformationServer.iml
@@ -17,5 +17,8 @@
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/wasteinformationserver/basicutils/Log.java b/src/main/java/com/wasteinformationserver/basicutils/Log.java
index 0f14b7c..505fed0 100644
--- a/src/main/java/com/wasteinformationserver/basicutils/Log.java
+++ b/src/main/java/com/wasteinformationserver/basicutils/Log.java
@@ -24,57 +24,65 @@ public class Log {
public static final int MESSAGE = 2;
public static final int DEBUG = 1;
+ private static int Loglevel = 0;
+
private static ArrayList colors = new ArrayList(Arrays.asList("", "DEBUG", "MESSAGE", "INFO", "WARNING", "ERROR", "CRITICAL_ERROR"));
public static void criticalerror(Object msg) {
- log(msg, CRITICAL_ERROR);
+ if (Loglevel <= CRITICAL_ERROR)
+ log(msg, CRITICAL_ERROR);
}
public static void error(Object msg) {
- log(msg, ERROR);
+ if (Loglevel <= ERROR)
+ log(msg, ERROR);
}
public static void warning(Object msg) {
- log(msg, WARNING);
+ if (Loglevel <= WARNING)
+ log(msg, WARNING);
}
public static void info(Object msg) {
- log(msg, INFO);
+ if (Loglevel <= INFO)
+ log(msg, INFO);
}
public static void message(Object msg) {
- log(msg, MESSAGE);
+ if (Loglevel <= MESSAGE)
+ log(msg, MESSAGE);
}
public static void debug(Object msg) {
- log(msg, DEBUG);
+ if (Loglevel <= DEBUG)
+ log(msg, DEBUG);
}
public static void log(Object msg, int level) {
boolean iswindows = System.getProperty("os.name").contains("Windows");
StringBuilder builder = new StringBuilder();
- if (!iswindows){
- switch (level) {
- case INFO:
- builder.append(ANSI_CYAN);
- break;
- case WARNING:
- builder.append(ANSI_YELLOW);
- break;
- case ERROR:
- builder.append(ANSI_RED);
- break;
- case CRITICAL_ERROR:
- builder.append(ANSI_RED);
- break;
- case MESSAGE:
- builder.append(ANSI_WHITE);
- break;
- case DEBUG:
- builder.append(ANSI_BLUE);
- break;
- }
+ if (!iswindows) {
+ switch (level) {
+ case INFO:
+ builder.append(ANSI_CYAN);
+ break;
+ case WARNING:
+ builder.append(ANSI_YELLOW);
+ break;
+ case ERROR:
+ builder.append(ANSI_RED);
+ break;
+ case CRITICAL_ERROR:
+ builder.append(ANSI_RED);
+ break;
+ case MESSAGE:
+ builder.append(ANSI_WHITE);
+ break;
+ case DEBUG:
+ builder.append(ANSI_BLUE);
+ break;
+ }
}
builder.append("[");
@@ -89,14 +97,14 @@ public class Log {
builder.append(colors.get(level));
builder.append("]");
- if (!iswindows){
+ if (!iswindows) {
builder.append(ANSI_WHITE);
}
builder.append(" - ");
builder.append(msg.toString());
- if (!iswindows){
+ if (!iswindows) {
builder.append(ANSI_RESET);
}
System.out.println(builder.toString());
@@ -108,4 +116,8 @@ public class Log {
return date_format.format(resultdate);
}
+ public static void setLevel(int level) {
+ Loglevel = level;
+ }
+
}
diff --git a/src/main/java/com/wasteinformationserver/main.java b/src/main/java/com/wasteinformationserver/main.java
index 342361c..b43b53b 100644
--- a/src/main/java/com/wasteinformationserver/main.java
+++ b/src/main/java/com/wasteinformationserver/main.java
@@ -10,6 +10,7 @@ import java.io.IOException;
public class main {
public static void main(String[] args) {
+ Log.setLevel(Log.DEBUG);
Runtime.getRuntime().addShutdownHook(new Thread(() -> {