diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 2e09d28..46860ab 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
4.0.0
org.openautonomousconnection
INSServer
- 1.0.1-BETA.0.1
+ 1.0.1-BETA.0.2
The default INS-Server
https://open-autonomous-connection.org/
diff --git a/pom.xml b/pom.xml
index 7a70150..cead4d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.openautonomousconnection
INSServer
- 1.0.1-BETA.0.1
+ 1.0.1-BETA.0.2
Open Autonomous Connection
https://open-autonomous-connection.org/
@@ -69,7 +69,7 @@
org.openautonomousconnection
Protocol
- 1.0.1-BETA.0.3
+ 1.0.1-BETA.0.5
org.mariadb.jdbc
diff --git a/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java b/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java
index 0b6f1b3..3ef94b5 100644
--- a/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java
+++ b/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java
@@ -71,7 +71,7 @@ public final class DatabaseINSServer extends ProtocolINSServer {
out.sort(recordComparator(type));
return out;
} catch (SQLException ex) {
- getProtocolBridge().getLogger().exception(
+ getProtocolBridge().getProtocolValues().logger.exception(
"INS resolve failed for " + formatName(tln, name, sub) + " type=" + type,
ex
);
@@ -100,7 +100,7 @@ public final class DatabaseINSServer extends ProtocolINSServer {
if (rs.next()) return rs.getString("info");
}
} catch (SQLException ex) {
- getProtocolBridge().getLogger().exception("Failed to resolve TLN info site for tln=" + tln, ex);
+ getProtocolBridge().getProtocolValues().logger.exception("Failed to resolve TLN info site for tln=" + tln, ex);
}
return null;
@@ -131,12 +131,12 @@ public final class DatabaseINSServer extends ProtocolINSServer {
String canonical = formatName(tln, name, sub).toLowerCase(Locale.ROOT);
if (!visited.add(canonical)) {
// loop detected
- getProtocolBridge().getLogger().warn("CNAME loop detected for " + canonical + " type=" + requestedType);
+ getProtocolBridge().getProtocolValues().logger.warn("CNAME loop detected for " + canonical + " type=" + requestedType);
return new ArrayList<>();
}
if (depth > MAX_CNAME_DEPTH) {
- getProtocolBridge().getLogger().warn("CNAME recursion limit exceeded for " + canonical + " type=" + requestedType);
+ getProtocolBridge().getProtocolValues().logger.warn("CNAME recursion limit exceeded for " + canonical + " type=" + requestedType);
return new ArrayList<>();
}
@@ -169,7 +169,7 @@ public final class DatabaseINSServer extends ProtocolINSServer {
for (INSRecord cname : cnames) {
TargetName target = parseCnameTarget(cname.value);
if (target == null) {
- getProtocolBridge().getLogger().warn("Invalid CNAME target '" + cname.value + "' on " + canonical);
+ getProtocolBridge().getProtocolValues().logger.warn("Invalid CNAME target '" + cname.value + "' on " + canonical);
continue;
}
diff --git a/src/main/java/org/openautonomousconnection/insserver/Listener.java b/src/main/java/org/openautonomousconnection/insserver/Listener.java
index 570d2b8..9660f19 100644
--- a/src/main/java/org/openautonomousconnection/insserver/Listener.java
+++ b/src/main/java/org/openautonomousconnection/insserver/Listener.java
@@ -10,11 +10,11 @@ public class Listener extends EventListener {
public void onCommandNotFound(CommandNotFoundEvent event) {
StringBuilder argsBuilder = new StringBuilder();
for (String arg : event.getArgs()) argsBuilder.append(arg).append(" ");
- Main.getProtocolBridge().getLogger().error("Command '" + event.getName() + argsBuilder.toString() + "' not found!");
+ Main.getProtocolBridge().getProtocolValues().logger.error("Command '" + event.getName() + argsBuilder.toString() + "' not found!");
}
@dev.unlegitdqrk.unlegitlibrary.event.Listener
public void onMissingCommandPermission(CommandExecutorMissingPermissionEvent event) {
- Main.getProtocolBridge().getLogger().error("You do not have enough permissions to execute this command!");
+ Main.getProtocolBridge().getProtocolValues().logger.error("You do not have enough permissions to execute this command!");
}
}
diff --git a/src/main/java/org/openautonomousconnection/insserver/Main.java b/src/main/java/org/openautonomousconnection/insserver/Main.java
index 3c080a8..3099767 100644
--- a/src/main/java/org/openautonomousconnection/insserver/Main.java
+++ b/src/main/java/org/openautonomousconnection/insserver/Main.java
@@ -31,10 +31,15 @@ public class Main {
private static ProtocolValues values;
public static void main(String[] args) throws Exception {
+ if (!new File("logs").exists()) new File("logs").mkdir();
+ Logger logger = new Logger(new File("logs"), false, true);
+
values = new ProtocolValues();
values.packetHandler = new PacketHandler();
values.eventManager = new EventManager();
+ values.protocolVersion = ProtocolVersion.PV_1_0_1_BETA;
values.eventManager.registerListener(new Listener());
+ values.logger = logger;
if (!new File("config.properties").exists()) {
new File("config.properties").createNewFile();
@@ -86,8 +91,7 @@ public class Main {
String frontend = config.getString("ins.frontend");
DatabaseINSServer server = new DatabaseINSServer(info, frontend, url, user, password);
- Logger logger = new Logger(new File("logs"), false, true);
- protocolBridge = new ProtocolBridge(server, values, ProtocolVersion.PV_1_0_1_BETA, logger, new AddonLoader(values.eventManager, logger));
+ protocolBridge = new ProtocolBridge(server, values);
server.start(tcpPort);
commandManager = new CommandManager(values.eventManager);