Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up some log messages

This commit is contained in:
ME1312 2017-04-03 13:52:28 -04:00
parent e22e669b78
commit 12f75b9de5
12 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Artifacts/SubServers.Bungee.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Client.Bukkit.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Host.jar
View File

Binary file not shown.

2
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
View File

@ -25,7 +25,7 @@ public final class SubPlugin extends JavaPlugin {
public UIHandler gui = null;
public final Version version;
public final Version bversion = new Version(2);
public final Version bversion = null;
public final SubAPI api = new SubAPI(this);
public SubPlugin() {

10
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
View File

@ -78,7 +78,7 @@ public class SubCreator {
generateClient(dir, name, type);
copyFolder(new UniversalFile(host.dir, "Templates:Spigot Plugins"), new UniversalFile(dir, "plugins"));
} catch (Exception e) {
e.printStackTrace();
logger.logger.error.println(e);
}
} else if (type == ServerType.VANILLA) {
@ -88,7 +88,7 @@ public class SubCreator {
generateEULA(dir);
generateProperties(dir, port);
} catch (FileNotFoundException | UnsupportedEncodingException e) {
e.printStackTrace();
logger.logger.error.println(e);
}
} else if (type == ServerType.SPONGE) {
try {
@ -141,7 +141,7 @@ public class SubCreator {
copyFolder(new UniversalFile(host.dir, "Templates:Sponge Config"), new UniversalFile(dir, "config"));
copyFolder(new UniversalFile(host.dir, "Templates:Sponge Mods"), new UniversalFile(dir, "mods"));
} catch (ParserConfigurationException | IOException | SAXException | NullPointerException e) {
e.printStackTrace();
logger.logger.error.println(e);
}
}
@ -169,7 +169,7 @@ public class SubCreator {
process.waitFor();
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
logger.logger.error.println(e);
}
if (process.exitValue() != 0) {
logger.logger.info.println("Problem Setting Executable Permissions.");
@ -191,7 +191,7 @@ public class SubCreator {
this.process.waitFor();
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
logger.logger.error.println(e);
}
JSONObject info = new JSONObject();

2
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLogger.java
View File

@ -58,7 +58,7 @@ public class SubLogger {
this.writer.println("---------- LOG START \u2014 " + name + " ----------");
this.writer.flush();
} catch (UnsupportedEncodingException | FileNotFoundException e) {
e.printStackTrace();
logger.error.println(e);
}
}
if (out == null) (out = new Thread(() -> start(process.getInputStream(), false))).start();

6
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java
View File

@ -96,7 +96,7 @@ public class SubServer {
if (process.isAlive()) process.waitFor();
} catch (IOException | InterruptedException e) {
e.printStackTrace();
host.log.error.println(e);
allowrestart = false;
if (falsestart) host.subdata.sendPacket(new PacketExUpdateServer(this, PacketExUpdateServer.UpdateType.LAUNCH_EXCEPTION));
}
@ -132,7 +132,7 @@ public class SubServer {
command.flush();
}
} catch (IOException e) {
e.printStackTrace();
host.log.error.println(e);
}
}
}
@ -160,7 +160,7 @@ public class SubServer {
this.command.flush();
}
} catch (IOException e) {
e.printStackTrace();
host.log.error.println(e);
}
}
}

2
SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java
View File

@ -73,7 +73,7 @@ public class PacketExAddServer implements PacketIn, PacketOut {
SubServer server = new SubServer(host, data.getJSONObject("server").getString("name"), data.getJSONObject("server").getBoolean("enabled"), data.getJSONObject("server").getBoolean("log"),
data.getJSONObject("server").getString("dir"), new Executable(data.getJSONObject("server").getString("exec")), data.getJSONObject("server").getString("stopcmd"));
host.servers.put(data.getJSONObject("server").getString("name").toLowerCase(), server);
log.info.println("Added Server \u2014 " + data.getJSONObject("server").getString("name"));
log.info.println("Added Server - " + data.getJSONObject("server").getString("name"));
if (data.getJSONObject("server").keySet().contains("running")) server.start(UUID.fromString(data.getJSONObject("server").getString("running")));
host.subdata.sendPacket(new PacketExAddServer(0, "Server Added Successfully", (data.keySet().contains("id"))?data.getString("id"):null));
}

2
SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java
View File

@ -105,7 +105,7 @@ public class PacketExDeleteServer implements PacketIn, PacketOut {
} catch (Exception e) {
e.printStackTrace();
}
log.info.println("Deleted Server \u2014 " + data.getString("server"));
log.info.println("Deleted Server - " + data.getString("server"));
host.subdata.sendPacket(new PacketExDeleteServer(0, "Server Deleted Successfully", (data.keySet().contains("id"))?data.getString("id"):null));
}).start();
}

2
SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java
View File

@ -71,7 +71,7 @@ public class PacketExRemoveServer implements PacketIn, PacketOut {
host.subdata.sendPacket(new PacketExRemoveServer(2, "That server is still running.", (data.keySet().contains("id"))?data.getString("id"):null));
} else {
host.servers.remove(data.getString("server").toLowerCase());
log.info.println("Removed Server \u2014 " + data.getString("name"));
log.info.println("Removed Server - " + data.getString("name"));
host.subdata.sendPacket(new PacketExRemoveServer(0, "Server Removed Successfully", (data.keySet().contains("id"))?data.getString("id"):null));
}
} catch (Throwable e) {

7
SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketOutExRequestQueue.java
View File

@ -1,16 +1,9 @@
package net.ME1312.SubServers.Host.Network.Packet;
import net.ME1312.SubServers.Host.Library.Config.YAMLSection;
import net.ME1312.SubServers.Host.Library.Log.Logger;
import net.ME1312.SubServers.Host.Library.Version.Version;
import net.ME1312.SubServers.Host.Network.PacketIn;
import net.ME1312.SubServers.Host.Network.PacketOut;
import net.ME1312.SubServers.Host.Network.SubDataClient;
import net.ME1312.SubServers.Host.SubServers;
import org.json.JSONObject;
import java.lang.reflect.Field;
/**
* Queue Request Packet
*/

16
SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java
View File

@ -77,15 +77,15 @@ public final class SubServers {
if (!(new UniversalFile(dir, "Templates:Spigot Plugins").exists())) {
new UniversalFile(dir, "Templates:Spigot Plugins").mkdirs();
System.out.println("SubServers > Created ~/Templates/Spigot Plugins");
log.info.println("SubServers > Created ~/Templates/Spigot Plugins");
}
if (!(new UniversalFile(dir, "Templates:Sponge Config").exists())) {
new UniversalFile(dir, "Templates:Sponge Config").mkdir();
System.out.println("SubServers > Created ~/Templates/Sponge Config");
log.info.println("SubServers > Created ~/Templates/Sponge Config");
}
if (!(new UniversalFile(dir, "Templates:Sponge Mods").exists())) {
new UniversalFile(dir, "Templates:Sponge Mods").mkdir();
System.out.println("SubServers > Created ~/Templates/Sponge Mods");
log.info.println("SubServers > Created ~/Templates/Sponge Mods");
}
if (new UniversalFile(dir, "Recently Deleted").exists()) {
@ -99,25 +99,25 @@ public final class SubServers {
if (TimeUnit.MILLISECONDS.toDays(Calendar.getInstance().getTime().getTime() - json.getLong("Timestamp")) >= 7) {
Util.deleteDirectory(file);
f--;
System.out.println("SubServers > Removed ~/Recently Deleted/" + file.getName());
log.info.println("SubServers > Removed ~/Recently Deleted/" + file.getName());
}
} else {
Util.deleteDirectory(file);
f--;
System.out.println("SubServers > Removed ~/Recently Deleted/" + file.getName());
log.info.println("SubServers > Removed ~/Recently Deleted/" + file.getName());
}
} else {
Util.deleteDirectory(file);
f--;
System.out.println("SubServers > Removed ~/Recently Deleted/" + file.getName());
log.info.println("SubServers > Removed ~/Recently Deleted/" + file.getName());
}
} else {
Files.delete(file.toPath());
f--;
System.out.println("SubServers > Removed ~/Recently Deleted/" + file.getName());
log.info.println("SubServers > Removed ~/Recently Deleted/" + file.getName());
}
} catch (Exception e) {
e.printStackTrace();
log.error.println(e);
}
}
if (f <= 0) {