Support for LogLevel in EffLog

src/main/java/ch/njol/skript/effects/EffLog.java

@@ -53,11 +53,16 @@
 @Description({"Writes text into a .log file. Skript will write these files to /plugins/Skript/logs.",
 		"NB: Using 'server.log' as the log file will write to the default server log. Omitting the log file altogether will log the message as '[Skript] [<script>.sk] <message>' in the server log."})
 @Examples({"on place of TNT:",
-		"	log \"%player% placed TNT in %world% at %location of block%\" to \"tnt/placement.log\""})
-@Since("2.0")
+	    "	log \"%player% placed TNT in %world% at %location of block%\" to file \"tnt/placement.log\"",
+	    "	log \"%player% placed TNT in %world% at %location of block%\" to file \"tnt/placement.log\"\"with severity of info\"",
+		"	log \"%player% placed TNT in %world% at %location of block%\" to file \"tnt/placement.log\"\"with severity of warning\"",
+        "   log \"%player% placed TNT in %world% at %location of block%\" to file \"tnt/placement.log\"\"with severity of error\""})
+
+
+@Since("2.0, 2.9 (Adds severity to logs)")
 public class EffLog extends Effect {
 	static {
-		Skript.registerEffect(EffLog.class, "log %strings% [(to|in) [file[s]] %-strings%]");
+		Skript.registerEffect(EffLog.class, "log %strings% [(to|in) [file[s]] %-strings%] [with severity (of) (1:warning|2:severe)]");
 	}
 
 	private final static File logsFolder = new File(Skript.getInstance().getDataFolder(), "logs");
@@ -77,12 +82,15 @@ public void close() {
 	private Expression<String> messages;
 	@Nullable
 	private Expression<String> files;
-
+
+	private int loglevel;
+
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parser) {
 		messages = (Expression<String>) exprs[0];
 		files = (Expression<String>) exprs[1];
+		loglevel = parser.mark;
 		return true;
 	}
 
@@ -91,28 +99,35 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 	protected void execute(final Event e) {
 		for (final String message : messages.getArray(e)) {
 			if (files != null) {
-				for (String s : files.getArray(e)) {
-					s = s.toLowerCase(Locale.ENGLISH);
-					if (!s.endsWith(".log"))
-						s += ".log";
-					if (s.equals("server.log")) {
-						SkriptLogger.LOGGER.log(Level.INFO, message);
-						continue;
+				for (String logFile : files.getArray(e)) {
+					logFile = logFile.toLowerCase(Locale.ENGLISH);
+					if (!logFile.endsWith(".log"))
+						logFile += ".log";
+					if (logFile.equals("server.log")) {
+						switch (loglevel) {
+							case 1: SkriptLogger.LOGGER.log(Level.WARNING, message);
+								break;
+							case 2: SkriptLogger.LOGGER.log(Level.SEVERE, message);
+								break;
+							default:
+								SkriptLogger.LOGGER.log(Level.INFO, message);
+
+						}
 					}
-					PrintWriter w = writers.get(s);
-					if (w == null) {
-						final File f = new File(logsFolder, s); // REMIND what if s contains '..'?
+					PrintWriter logWriter = writers.get(logFile);
+					if (logWriter == null) {
+						final File logFolder = new File(logsFolder, logFile); // REMIND what if logFile contains '..'?
 						try {
-							f.getParentFile().mkdirs();
-							w = new PrintWriter(new BufferedWriter(new FileWriter(f, true)));
-							writers.put(s, w);
+							logFolder.getParentFile().mkdirs();
+							logWriter = new PrintWriter(new BufferedWriter(new FileWriter(logFolder, true)));
+							writers.put(logFile, logWriter);
 						} catch (final IOException ex) {
-							Skript.error("Cannot write to log file '" + s + "' (" + f.getPath() + "): " + ExceptionUtils.toString(ex));
+							Skript.error("Cannot write to log file '" + logFile + "' (" + logFolder.getPath() + "): " + ExceptionUtils.toString(ex));
 							return;
 						}
 					}
-					w.println("[" + SkriptConfig.formatDate(System.currentTimeMillis()) + "] " + message);
-					w.flush();
+					logWriter.println("[" + SkriptConfig.formatDate(System.currentTimeMillis()) + "] " + message);
+					logWriter.flush();
 				}
 			} else {
 				Trigger t = getTrigger();
@@ -122,7 +137,14 @@ protected void execute(final Event e) {
 					if (script != null)
 						scriptName = script.getConfig().getFileName();
 				}
-				Skript.info("[" + scriptName + "] " + message);
+				switch (loglevel) {
+					case 1: Skript.warning("[" + scriptName + "] " + message);
+						break;
+					case 2: Skript.error("[" + scriptName + "] " + message);
+						break;
+					default:
+						Skript.info("[" + scriptName + "] " + message);
+				}
 			}
 		}
 	}