disable logging completely, convert classinfo registration to static

Author: Pikachu920

build.gradle

@@ -41,15 +41,10 @@ repositories {
 
 
 dependencies {
-    compileOnly('org.spigotmc:spigot-api:1.12.1-R0.1-SNAPSHOT') {
-        exclude group: 'org.slf4j', module: 'slf4j-simple'
-    }
+    compileOnly('org.spigotmc:spigot-api:1.12.1-R0.1-SNAPSHOT')
     testCompile group: 'junit', name: 'junit', version: '4.12'
     compileOnly 'ch.njol:skript:2.2-dev33'
     compile('com.sparkjava:spark-core:2.7.2')
-    compile group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
-    compile('ch.qos.logback:logback-classic:1.2.3')
-
 }
 
 

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'veba'
+rootProject.name = 'WebAddon'
 

src/main/java/com/pikachu/webaddon/WebAddon.java

@@ -2,8 +2,9 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAddon;
-import com.pikachu.webaddon.skript.classinfos.Classinfos;
+import com.pikachu.webaddon.util.VoidLogger;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.eclipse.jetty.util.log.Log;
 
 import java.io.IOException;
 
@@ -14,10 +15,13 @@ public class WebAddon extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        // disable all logging with various methods
+        Log.setLog(new VoidLogger());
+        System.setProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StdErrLog");
+        System.setProperty("org.eclipse.jetty.LEVEL", "OFF");
         instance = this;
         try {
             getAddonInstance().loadClasses("com.pikachu.webaddon", "skript");
-            Classinfos.register();
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/com/pikachu/webaddon/skript/classinfos/Classinfos.java

@@ -6,7 +6,7 @@
 
 public class Classinfos {
 
-	public static void register() {
+	static {
 		new SimpleType<Request>(Request.class, "request", "requests?") {
 			@Override
 			public Request parse(String arg0, ParseContext arg1) {

src/main/java/com/pikachu/webaddon/skript/scopes/http/ScopeHTTPServer.java

@@ -5,35 +5,31 @@
 import ch.njol.skript.config.Node;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.Conditional;
 import ch.njol.skript.lang.Literal;
-import ch.njol.skript.lang.SelfRegisteringSkriptEvent;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.Trigger;
-import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.lang.TriggerSection;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.util.Getter;
-import ch.njol.skript.variables.Variables;
 import com.pikachu.webaddon.bukkit.events.HTTPRequestEvent;
 import com.pikachu.webaddon.bukkit.events.StubBukkitEvent;
 import com.pikachu.webaddon.skript.scopes.http.requests.RequestScope;
 import com.pikachu.webaddon.util.Util;
-import com.pikachu.webaddon.util.scope.EffectSection;
 import com.pikachu.webaddon.util.scope.EventScope;
 import org.bukkit.event.Event;
 import spark.Request;
 import spark.Response;
 import spark.Service;
-import spark.servlet.SparkApplication;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Pattern;
+import java.util.UUID;
 
 public class ScopeHTTPServer extends EventScope {
 
+	private static boolean parsing;
+
     static {
         Skript.registerEvent("web server", ScopeHTTPServer.class, StubBukkitEvent.class,
                 "[open a] (web|http) server on port <.+>");
@@ -51,7 +47,6 @@ public Response get(HTTPRequestEvent arg) {
                 return arg.getResponse();
             }
         }, 0);
-
     }
 
     private String stringRep;
@@ -61,33 +56,39 @@ public Response get(HTTPRequestEvent arg) {
 
     @Override
     public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseResult parseResult) {
+		parsing = true;
         SectionNode sectionNode = (SectionNode) SkriptLogger.getNode();
         stringRep = sectionNode.getKey();
         String stringPort = parseResult.regexes.get(0).group();
         if (stringPort.matches("\\d{1,5}")) {
             port = Integer.parseInt(stringPort);
         } else {
             Skript.error("'" + stringPort + "' is not a valid port");
+			parsing = false;
             return false;
         }
         if (stringRep.startsWith("on")) {
             Skript.error("You may not use 'on' with a web server!");
+			parsing = false;
             return false;
         }
 
         for (Node node : sectionNode) {
             Util.setKey(node, ScriptLoader.replaceOptions(node.getKey()));
             if (!(node instanceof SectionNode)) {
                 Skript.error("A web server may only contain request scopes");
+				parsing = false;
                 return false;
             }
             if (RequestScope.getPatterns().stream().noneMatch(p -> node.getKey().matches(p))) {
                 Skript.error("'" + node.getKey() + "' is not a request scope (e.g. 'get /index:')");
+				parsing = false;
                 return false;
             }
             rawNodes.add((SectionNode) node);
         }
         Util.clearSectionNode(sectionNode);
+		parsing = false;
         return true;
     }
 
@@ -108,6 +109,8 @@ public void load() {
 
     @Override
     public void unregister(Trigger t) {
+		// workaround for spark npe
+		server.get("workaroundForSparkNpe" + UUID.randomUUID().toString(), (req, resp) -> "you shouldn't be seeing this");
         server.stop();
     }
 

src/main/java/com/pikachu/webaddon/skript/scopes/http/requests/SimpleRequestScope.java

@@ -1,6 +1,5 @@
 package com.pikachu.webaddon.skript.scopes.http.requests;
 
-import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
@@ -18,6 +17,9 @@ public static void register(Class<? extends SimpleRequestScope> clazz, String ty
 
 	@Override
 	public final boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		if (!hasSection()) {
+			return false;
+		}
 		if (parseResult.regexes.size() != 1) {
 			throw new UnsupportedOperationException("A " + getClass().getSimpleName() + " must have only one regex!");
 		}