Updated frontend to new Protocol
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.openautonomousconnection</groupId>
|
||||
<artifactId>INSServer</artifactId>
|
||||
<version>1.0.1-BETA.0.1</version>
|
||||
<version>1.0.1-BETA.0.2</version>
|
||||
<description>The default INS-Server</description>
|
||||
<url>https://open-autonomous-connection.org/</url>
|
||||
<issueManagement>
|
||||
|
||||
4
pom.xml
4
pom.xml
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>org.openautonomousconnection</groupId>
|
||||
<artifactId>INSServer</artifactId>
|
||||
<version>1.0.1-BETA.0.1</version>
|
||||
<version>1.0.1-BETA.0.2</version>
|
||||
<organization>
|
||||
<name>Open Autonomous Connection</name>
|
||||
<url>https://open-autonomous-connection.org/</url>
|
||||
@@ -69,7 +69,7 @@
|
||||
<dependency>
|
||||
<groupId>org.openautonomousconnection</groupId>
|
||||
<artifactId>Protocol</artifactId>
|
||||
<version>1.0.1-BETA.0.3</version>
|
||||
<version>1.0.1-BETA.0.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mariadb.jdbc</groupId>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user