JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ReportServer fixes and improvements.

This commit is contained in:
Keir 2015-12-16 15:05:00 +00:00
parent 6f82f8349d
commit cd18d2a94f
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Plugins/Mineplex.ChatSnapManager/src/mineplex/chatsnap/JedisPubSubHandler.java
View File

@ -4,11 +4,9 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import redis.clients.jedis.JedisPubSub; import redis.clients.jedis.JedisPubSub;
/** /**
@ -18,9 +16,7 @@ public class JedisPubSubHandler extends JedisPubSub
{ {
private File _directory; private File _directory;
private Gson _gson = new GsonBuilder() private Gson _gson = new Gson();
.setPrettyPrinting()
.create();
public JedisPubSubHandler(File directory) public JedisPubSubHandler(File directory)
{ {
@ -34,19 +30,20 @@ public class JedisPubSubHandler extends JedisPubSub
@Override @Override
public void onMessage(String channel, String dataString) public void onMessage(String channel, String dataString)
{
try
{ {
if (channel.equals(ReportServer.CHANNEL_DEPLOY)) if (channel.equals(ReportServer.CHANNEL_DEPLOY))
{ {
JsonObject data = _gson.fromJson(dataString, JsonObject.class); Map<String, Object> data = _gson.fromJson(dataString, Map.class);
String token = data.get("token").getAsString(); String token = (String) data.get("token");
JsonArray snapshotArray = data.get("snapshots").getAsJsonArray();
File target = new File(_directory, token + ".json"); File target = new File(_directory, token + ".json");
String json = _gson.toJson(snapshotArray); System.out.println("Received ChatSnap, token = " + token + ", writing to file.");
try try
{ {
Files.write(target.toPath(), Arrays.asList(json.split("\n"))); Files.write(target.toPath(), Arrays.asList(dataString.split("\n")));
} }
catch (IOException e) catch (IOException e)
{ {
@ -57,6 +54,7 @@ public class JedisPubSubHandler extends JedisPubSub
{ {
// dataString = token // dataString = token
File target = new File(_directory, dataString + ".json"); File target = new File(_directory, dataString + ".json");
System.out.println("Removing ChatSnap, token = " + dataString);
if (target.exists() && !target.delete()) if (target.exists() && !target.delete())
{ {
@ -64,6 +62,15 @@ public class JedisPubSubHandler extends JedisPubSub
} }
} }
} }
catch (Exception e)
{
System.out.println("Excepting whilst receiving redis message.");
System.out.println("Channel = " + channel);
System.out.println("Data: ");
System.out.println(dataString);
e.printStackTrace();
}
}
@Override @Override
public void onPMessage(String s, String s1, String s2) public void onPMessage(String s, String s1, String s2)

4
Plugins/Mineplex.ChatSnapManager/src/mineplex/chatsnap/ReportServer.java
View File

@ -16,8 +16,8 @@ public class ReportServer
public static void main(String[] args) public static void main(String[] args)
{ {
new ReportServer(new JedisPool(new JedisPoolConfig(), "10.3.203.80", 6379)); // TODO is this okay? System.out.println("Starting...");
System.out.println("Started."); new ReportServer(new JedisPool(new JedisPoolConfig(), "10.3.203.80", 6379, 10)); // TODO is this okay?
} }
private JedisPool _jedisPool; private JedisPool _jedisPool;

14
Plugins/Mineplex.Core/src/mineplex/core/chatsnap/publishing/SnapshotPublisher.java
View File

@ -1,9 +1,5 @@
package mineplex.core.chatsnap.publishing; package mineplex.core.chatsnap.publishing;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.Collection; import java.util.Collection;
@ -15,8 +11,6 @@ import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import com.google.gson.FieldNamingPolicy;
import com.google.gson.FieldNamingStrategy;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@ -70,12 +64,12 @@ public class SnapshotPublisher
jsonObject.addProperty("token", token); jsonObject.addProperty("token", token);
String json = GSON.toJson(jsonObject); String json = GSON.toJson(jsonObject);
/*try (Jedis jedis = _jedisPool.getResource()) try (Jedis jedis = _jedisPool.getResource())
{ {
jedis.publish(CHANNEL_DEPLOY, json); jedis.publish(CHANNEL_DEPLOY, json);
}*/ }
try /*try
{ {
File dir = new File("data"); File dir = new File("data");
dir.mkdir(); dir.mkdir();
@ -88,7 +82,7 @@ public class SnapshotPublisher
catch (IOException e) catch (IOException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }*/
} }
public void unpublishChatLog(String token) public void unpublishChatLog(String token)