mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
Rerwrite the metrics code to be closer to the Bukkit version.
This commit is contained in:
md_5
parent
125729df15
commit
aa42a15d01
2 changed files with 727 additions and 573 deletions
|
|
@ -1,11 +1,11 @@
|
||||||
From a79861261884846b740f136b75bff9a91466a1ad Mon Sep 17 00:00:00 2001
|
From a07bdb7064b9f0e6408d06ee7e827711d198ddd6 Mon Sep 17 00:00:00 2001
|
||||||
From: md_5 <md_5@live.com.au>
|
From: md_5 <md_5@live.com.au>
|
||||||
Date: Sun, 3 Feb 2013 12:21:52 +1100
|
Date: Sun, 3 Feb 2013 12:21:52 +1100
|
||||||
Subject: [PATCH] Spigot changes.
|
Subject: [PATCH] Spigot changes.
|
||||||
|
|
||||||
---
|
---
|
||||||
.gitignore | 2 +
|
.gitignore | 2 +
|
||||||
src/main/java/net/minecraft/server/Block.java | 12 +
|
src/main/java/net/minecraft/server/Block.java | 12 ++
|
||||||
.../java/net/minecraft/server/BlockCactus.java | 2 +-
|
.../java/net/minecraft/server/BlockCactus.java | 2 +-
|
||||||
src/main/java/net/minecraft/server/BlockCrops.java | 2 +-
|
src/main/java/net/minecraft/server/BlockCrops.java | 2 +-
|
||||||
src/main/java/net/minecraft/server/BlockGrass.java | 2 +-
|
src/main/java/net/minecraft/server/BlockGrass.java | 2 +-
|
||||||
|
|
@ -14,39 +14,35 @@ Subject: [PATCH] Spigot changes.
|
||||||
src/main/java/net/minecraft/server/BlockReed.java | 2 +-
|
src/main/java/net/minecraft/server/BlockReed.java | 2 +-
|
||||||
.../java/net/minecraft/server/BlockSapling.java | 2 +-
|
.../java/net/minecraft/server/BlockSapling.java | 2 +-
|
||||||
src/main/java/net/minecraft/server/BlockStem.java | 2 +-
|
src/main/java/net/minecraft/server/BlockStem.java | 2 +-
|
||||||
.../net/minecraft/server/ChunkRegionLoader.java | 35 +-
|
.../net/minecraft/server/ChunkRegionLoader.java | 35 +++-
|
||||||
.../java/net/minecraft/server/ChunkSection.java | 31 +-
|
.../java/net/minecraft/server/ChunkSection.java | 31 +++-
|
||||||
src/main/java/net/minecraft/server/EntityItem.java | 3 +-
|
src/main/java/net/minecraft/server/EntityItem.java | 3 +-
|
||||||
.../java/net/minecraft/server/EntitySquid.java | 4 -
|
.../java/net/minecraft/server/EntitySquid.java | 4 -
|
||||||
.../java/net/minecraft/server/MinecraftServer.java | 3 +
|
.../java/net/minecraft/server/MinecraftServer.java | 3 +
|
||||||
.../net/minecraft/server/PlayerConnection.java | 18 +-
|
.../net/minecraft/server/PlayerConnection.java | 18 +-
|
||||||
src/main/java/net/minecraft/server/PlayerList.java | 10 +-
|
src/main/java/net/minecraft/server/PlayerList.java | 10 +-
|
||||||
.../net/minecraft/server/ThreadLoginVerifier.java | 23 +
|
.../net/minecraft/server/ThreadLoginVerifier.java | 23 +++
|
||||||
src/main/java/net/minecraft/server/World.java | 200 ++++++++-
|
src/main/java/net/minecraft/server/World.java | 200 ++++++++++++++++++---
|
||||||
.../java/net/minecraft/server/WorldServer.java | 121 ++++-
|
.../java/net/minecraft/server/WorldServer.java | 121 ++++++++++---
|
||||||
.../java/org/bukkit/craftbukkit/CraftServer.java | 98 ++++-
|
.../java/org/bukkit/craftbukkit/CraftServer.java | 93 +++++++---
|
||||||
.../java/org/bukkit/craftbukkit/CraftWorld.java | 76 +++-
|
.../java/org/bukkit/craftbukkit/CraftWorld.java | 76 +++++++-
|
||||||
src/main/java/org/bukkit/craftbukkit/Spigot.java | 23 +
|
src/main/java/org/bukkit/craftbukkit/Spigot.java | 23 +++
|
||||||
.../craftbukkit/chunkio/ChunkIOProvider.java | 2 +-
|
.../craftbukkit/chunkio/ChunkIOProvider.java | 2 +-
|
||||||
.../bukkit/craftbukkit/command/RestartCommand.java | 24 +
|
.../bukkit/craftbukkit/command/RestartCommand.java | 24 +++
|
||||||
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 7 +
|
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 7 +
|
||||||
.../bukkit/craftbukkit/util/ExceptionHandler.java | 31 ++
|
.../bukkit/craftbukkit/util/ExceptionHandler.java | 31 ++++
|
||||||
.../bukkit/craftbukkit/util/ExceptionReporter.java | 26 ++
|
.../bukkit/craftbukkit/util/ExceptionReporter.java | 26 +++
|
||||||
.../java/org/bukkit/craftbukkit/util/FlatMap.java | 34 ++
|
.../java/org/bukkit/craftbukkit/util/FlatMap.java | 34 ++++
|
||||||
.../org/bukkit/craftbukkit/util/LongHashSet.java | 11 +-
|
.../org/bukkit/craftbukkit/util/LongHashSet.java | 11 +-
|
||||||
.../bukkit/craftbukkit/util/LongObjectHashMap.java | 5 +
|
.../bukkit/craftbukkit/util/LongObjectHashMap.java | 5 +
|
||||||
.../java/org/bukkit/craftbukkit/util/Metrics.java | 488 +++++++++++++++++++++
|
.../bukkit/craftbukkit/util/WatchdogThread.java | 88 +++++++++
|
||||||
.../org/bukkit/craftbukkit/util/TimedThread.java | 37 ++
|
src/main/resources/configurations/bukkit.yml | 30 ++++
|
||||||
.../bukkit/craftbukkit/util/WatchdogThread.java | 88 ++++
|
33 files changed, 828 insertions(+), 100 deletions(-)
|
||||||
src/main/resources/configurations/bukkit.yml | 30 ++
|
|
||||||
35 files changed, 1358 insertions(+), 100 deletions(-)
|
|
||||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java
|
create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/command/RestartCommand.java
|
create mode 100644 src/main/java/org/bukkit/craftbukkit/command/RestartCommand.java
|
||||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/ExceptionHandler.java
|
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/ExceptionHandler.java
|
||||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/ExceptionReporter.java
|
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/ExceptionReporter.java
|
||||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/FlatMap.java
|
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/FlatMap.java
|
||||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/Metrics.java
|
|
||||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/TimedThread.java
|
|
||||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/WatchdogThread.java
|
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/WatchdogThread.java
|
||||||
|
|
||||||
diff --git a/.gitignore b/.gitignore
|
diff --git a/.gitignore b/.gitignore
|
||||||
|
|
@ -1065,7 +1061,7 @@ index 3f73ef9..7032c61 100644
|
||||||
+ // Spigot end
|
+ // Spigot end
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index e7c0760..a7785b7 100644
|
index e7c0760..2b3c60a 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -146,7 +146,7 @@ public final class CraftServer implements Server {
|
@@ -146,7 +146,7 @@ public final class CraftServer implements Server {
|
||||||
|
|
@ -1092,7 +1088,7 @@ index e7c0760..a7785b7 100644
|
||||||
|
|
||||||
static {
|
static {
|
||||||
ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
|
ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
|
||||||
@@ -208,12 +216,25 @@ public final class CraftServer implements Server {
|
@@ -208,12 +216,20 @@ public final class CraftServer implements Server {
|
||||||
chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
|
chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
|
||||||
|
|
||||||
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
|
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
|
||||||
|
|
@ -1110,16 +1106,11 @@ index e7c0760..a7785b7 100644
|
||||||
+ configuration.save(getConfigFile());
|
+ configuration.save(getConfigFile());
|
||||||
+ } catch (IOException e) {
|
+ } catch (IOException e) {
|
||||||
+ }
|
+ }
|
||||||
+ try {
|
|
||||||
+ new org.bukkit.craftbukkit.util.Metrics().start();
|
|
||||||
+ } catch (IOException e) {
|
|
||||||
+ getLogger().log(Level.SEVERE, "Could not start metrics", e);
|
|
||||||
+ }
|
|
||||||
+ // Spigot end
|
+ // Spigot end
|
||||||
loadPlugins();
|
loadPlugins();
|
||||||
enablePlugins(PluginLoadOrder.STARTUP);
|
enablePlugins(PluginLoadOrder.STARTUP);
|
||||||
}
|
}
|
||||||
@@ -222,7 +243,7 @@ public final class CraftServer implements Server {
|
@@ -222,7 +238,7 @@ public final class CraftServer implements Server {
|
||||||
return (File) console.options.valueOf("bukkit-settings");
|
return (File) console.options.valueOf("bukkit-settings");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1128,7 +1119,7 @@ index e7c0760..a7785b7 100644
|
||||||
try {
|
try {
|
||||||
configuration.save(getConfigFile());
|
configuration.save(getConfigFile());
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
@@ -526,6 +547,7 @@ public final class CraftServer implements Server {
|
@@ -526,6 +542,7 @@ public final class CraftServer implements Server {
|
||||||
|
|
||||||
((DedicatedServer) console).propertyManager = config;
|
((DedicatedServer) console).propertyManager = config;
|
||||||
|
|
||||||
|
|
@ -1136,7 +1127,7 @@ index e7c0760..a7785b7 100644
|
||||||
boolean animals = config.getBoolean("spawn-animals", console.getSpawnAnimals());
|
boolean animals = config.getBoolean("spawn-animals", console.getSpawnAnimals());
|
||||||
boolean monsters = config.getBoolean("spawn-monsters", console.worlds.get(0).difficulty > 0);
|
boolean monsters = config.getBoolean("spawn-monsters", console.worlds.get(0).difficulty > 0);
|
||||||
int difficulty = config.getInt("difficulty", console.worlds.get(0).difficulty);
|
int difficulty = config.getInt("difficulty", console.worlds.get(0).difficulty);
|
||||||
@@ -591,6 +613,7 @@ public final class CraftServer implements Server {
|
@@ -591,6 +608,7 @@ public final class CraftServer implements Server {
|
||||||
"This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin"
|
"This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin"
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
@ -1144,7 +1135,7 @@ index e7c0760..a7785b7 100644
|
||||||
loadPlugins();
|
loadPlugins();
|
||||||
enablePlugins(PluginLoadOrder.STARTUP);
|
enablePlugins(PluginLoadOrder.STARTUP);
|
||||||
enablePlugins(PluginLoadOrder.POSTWORLD);
|
enablePlugins(PluginLoadOrder.POSTWORLD);
|
||||||
@@ -1039,11 +1062,8 @@ public final class CraftServer implements Server {
|
@@ -1039,11 +1057,8 @@ public final class CraftServer implements Server {
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1157,7 +1148,7 @@ index e7c0760..a7785b7 100644
|
||||||
OfflinePlayer result = getPlayerExact(name);
|
OfflinePlayer result = getPlayerExact(name);
|
||||||
String lname = name.toLowerCase();
|
String lname = name.toLowerCase();
|
||||||
|
|
||||||
@@ -1051,17 +1071,7 @@ public final class CraftServer implements Server {
|
@@ -1051,17 +1066,7 @@ public final class CraftServer implements Server {
|
||||||
result = offlinePlayers.get(lname);
|
result = offlinePlayers.get(lname);
|
||||||
|
|
||||||
if (result == null) {
|
if (result == null) {
|
||||||
|
|
@ -1176,7 +1167,7 @@ index e7c0760..a7785b7 100644
|
||||||
result = new CraftOfflinePlayer(this, name);
|
result = new CraftOfflinePlayer(this, name);
|
||||||
offlinePlayers.put(lname, result);
|
offlinePlayers.put(lname, result);
|
||||||
}
|
}
|
||||||
@@ -1199,7 +1209,7 @@ public final class CraftServer implements Server {
|
@@ -1199,7 +1204,7 @@ public final class CraftServer implements Server {
|
||||||
Set<OfflinePlayer> players = new HashSet<OfflinePlayer>();
|
Set<OfflinePlayer> players = new HashSet<OfflinePlayer>();
|
||||||
|
|
||||||
for (String file : files) {
|
for (String file : files) {
|
||||||
|
|
@ -1185,7 +1176,7 @@ index e7c0760..a7785b7 100644
|
||||||
}
|
}
|
||||||
players.addAll(Arrays.asList(getOnlinePlayers()));
|
players.addAll(Arrays.asList(getOnlinePlayers()));
|
||||||
|
|
||||||
@@ -1305,7 +1315,7 @@ public final class CraftServer implements Server {
|
@@ -1305,7 +1310,7 @@ public final class CraftServer implements Server {
|
||||||
public List<String> tabCompleteCommand(Player player, String message) {
|
public List<String> tabCompleteCommand(Player player, String message) {
|
||||||
List<String> completions = null;
|
List<String> completions = null;
|
||||||
try {
|
try {
|
||||||
|
|
@ -1194,7 +1185,7 @@ index e7c0760..a7785b7 100644
|
||||||
} catch (CommandException ex) {
|
} catch (CommandException ex) {
|
||||||
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
|
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
|
||||||
getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
|
getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
|
||||||
@@ -1341,4 +1351,52 @@ public final class CraftServer implements Server {
|
@@ -1341,4 +1346,52 @@ public final class CraftServer implements Server {
|
||||||
public CraftItemFactory getItemFactory() {
|
public CraftItemFactory getItemFactory() {
|
||||||
return CraftItemFactory.instance();
|
return CraftItemFactory.instance();
|
||||||
}
|
}
|
||||||
|
|
@ -1627,543 +1618,6 @@ index 01861cc..dbd33fa 100644
|
||||||
int index = (int) (keyIndex(key) & (BUCKET_SIZE - 1));
|
int index = (int) (keyIndex(key) & (BUCKET_SIZE - 1));
|
||||||
long[] inner = keys[index];
|
long[] inner = keys[index];
|
||||||
if (inner == null) {
|
if (inner == null) {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Metrics.java b/src/main/java/org/bukkit/craftbukkit/util/Metrics.java
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..da05b80
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/Metrics.java
|
|
||||||
@@ -0,0 +1,488 @@
|
|
||||||
+package org.bukkit.craftbukkit.util;
|
|
||||||
+
|
|
||||||
+import org.bukkit.Bukkit;
|
|
||||||
+import org.bukkit.configuration.file.YamlConfiguration;
|
|
||||||
+import java.io.BufferedReader;
|
|
||||||
+import java.io.File;
|
|
||||||
+import java.io.IOException;
|
|
||||||
+import java.io.InputStreamReader;
|
|
||||||
+import java.io.OutputStreamWriter;
|
|
||||||
+import java.io.UnsupportedEncodingException;
|
|
||||||
+import java.net.Proxy;
|
|
||||||
+import java.net.URL;
|
|
||||||
+import java.net.URLConnection;
|
|
||||||
+import java.net.URLEncoder;
|
|
||||||
+import java.util.Collections;
|
|
||||||
+import java.util.HashSet;
|
|
||||||
+import java.util.Iterator;
|
|
||||||
+import java.util.LinkedHashSet;
|
|
||||||
+import java.util.Set;
|
|
||||||
+import java.util.UUID;
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ * <p> The metrics class obtains data about a plugin and submits statistics
|
|
||||||
+ * about it to the metrics backend. </p> <p> Public methods provided by this
|
|
||||||
+ * class: </p>
|
|
||||||
+ * <code>
|
|
||||||
+ * Graph createGraph(String name); <br/>
|
|
||||||
+ * void addCustomData(Metrics.Plotter plotter); <br/>
|
|
||||||
+ * void start(); <br/>
|
|
||||||
+ * </code>
|
|
||||||
+ */
|
|
||||||
+public class Metrics {
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * The current revision number
|
|
||||||
+ */
|
|
||||||
+ private final static int REVISION = 5;
|
|
||||||
+ /**
|
|
||||||
+ * The base url of the metrics domain
|
|
||||||
+ */
|
|
||||||
+ private static final String BASE_URL = "http://mcstats.org";
|
|
||||||
+ /**
|
|
||||||
+ * The url used to report a server's status
|
|
||||||
+ */
|
|
||||||
+ private static final String REPORT_URL = "/report/%s";
|
|
||||||
+ /**
|
|
||||||
+ * The file where guid and opt out is stored in
|
|
||||||
+ */
|
|
||||||
+ private static final String CONFIG_FILE = "plugins/PluginMetrics/config.yml";
|
|
||||||
+ /**
|
|
||||||
+ * The separator to use for custom data. This MUST NOT change unless you are
|
|
||||||
+ * hosting your own version of metrics and want to change it.
|
|
||||||
+ */
|
|
||||||
+ private static final String CUSTOM_DATA_SEPARATOR = "~~";
|
|
||||||
+ /**
|
|
||||||
+ * Interval of time to ping (in minutes)
|
|
||||||
+ */
|
|
||||||
+ private final static int PING_INTERVAL = 5;
|
|
||||||
+ /**
|
|
||||||
+ * All of the custom graphs to submit to metrics
|
|
||||||
+ */
|
|
||||||
+ private final Set<Graph> graphs = Collections.synchronizedSet(new HashSet<Graph>());
|
|
||||||
+ /**
|
|
||||||
+ * The default graph, used for addCustomData when you don't want a specific
|
|
||||||
+ * graph
|
|
||||||
+ */
|
|
||||||
+ private final Graph defaultGraph = new Graph("Default");
|
|
||||||
+ /**
|
|
||||||
+ * The plugin configuration file
|
|
||||||
+ */
|
|
||||||
+ private final YamlConfiguration configuration;
|
|
||||||
+ /**
|
|
||||||
+ * Unique server id
|
|
||||||
+ */
|
|
||||||
+ private final String guid;
|
|
||||||
+
|
|
||||||
+ public Metrics() throws IOException {
|
|
||||||
+ // load the config
|
|
||||||
+ File file = new File(CONFIG_FILE);
|
|
||||||
+ configuration = YamlConfiguration.loadConfiguration(file);
|
|
||||||
+
|
|
||||||
+ // add some defaults
|
|
||||||
+ configuration.addDefault("opt-out", false);
|
|
||||||
+ configuration.addDefault("guid", UUID.randomUUID().toString());
|
|
||||||
+
|
|
||||||
+ // Do we need to create the file?
|
|
||||||
+ if (configuration.get("guid", null) == null) {
|
|
||||||
+ configuration.options().header("http://metrics.griefcraft.com").copyDefaults(true);
|
|
||||||
+ configuration.save(file);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Load the guid then
|
|
||||||
+ guid = configuration.getString("guid");
|
|
||||||
+
|
|
||||||
+ Graph graph = createGraph("Operating System");
|
|
||||||
+ // Plot the total amount of protections
|
|
||||||
+ graph.addPlotter(new Metrics.Plotter(System.getProperty("os.name")) {
|
|
||||||
+ @Override
|
|
||||||
+ public int getValue() {
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
+ graph = createGraph("System Cores");
|
|
||||||
+ // Plot the total amount of protections
|
|
||||||
+ graph.addPlotter(new Metrics.Plotter(Integer.toString(Runtime.getRuntime().availableProcessors())) {
|
|
||||||
+ @Override
|
|
||||||
+ public int getValue() {
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
+ graph = createGraph("System RAM");
|
|
||||||
+ long RAM = Runtime.getRuntime().maxMemory() / 1024L / 1024L;
|
|
||||||
+ String plotName;
|
|
||||||
+ if (RAM < 1024) {
|
|
||||||
+ plotName = "< 1024mb";
|
|
||||||
+ } else if (RAM < 2048) {
|
|
||||||
+ plotName = "1024-2048mb";
|
|
||||||
+ } else if (RAM < 4096) {
|
|
||||||
+ plotName = "2048-4096mb";
|
|
||||||
+ } else if (RAM < 8192) {
|
|
||||||
+ plotName = "4096-8192mb";
|
|
||||||
+ } else if (RAM < 16384) {
|
|
||||||
+ plotName = "8192-16384mb";
|
|
||||||
+ } else {
|
|
||||||
+ plotName = "16384+ mb";
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Plot the total amount of protections
|
|
||||||
+ graph.addPlotter(new Metrics.Plotter(plotName) {
|
|
||||||
+ @Override
|
|
||||||
+ public int getValue() {
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ });
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Construct and create a Graph that can be used to separate specific
|
|
||||||
+ * plotters to their own graphs on the metrics website. Plotters can be
|
|
||||||
+ * added to the graph object returned.
|
|
||||||
+ *
|
|
||||||
+ * @param name
|
|
||||||
+ * @return Graph object created. Will never return NULL under normal
|
|
||||||
+ * circumstances unless bad parameters are given
|
|
||||||
+ */
|
|
||||||
+ public Graph createGraph(String name) {
|
|
||||||
+ if (name == null) {
|
|
||||||
+ throw new IllegalArgumentException("Graph name cannot be null");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Construct the graph object
|
|
||||||
+ Graph graph = new Graph(name);
|
|
||||||
+
|
|
||||||
+ // Now we can add our graph
|
|
||||||
+ graphs.add(graph);
|
|
||||||
+
|
|
||||||
+ // and return back
|
|
||||||
+ return graph;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Adds a custom data plotter to the default graph
|
|
||||||
+ *
|
|
||||||
+ * @param plotter
|
|
||||||
+ */
|
|
||||||
+ public void addCustomData(Plotter plotter) {
|
|
||||||
+ if (plotter == null) {
|
|
||||||
+ throw new IllegalArgumentException("Plotter cannot be null");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Add the plotter to the graph o/
|
|
||||||
+ defaultGraph.addPlotter(plotter);
|
|
||||||
+
|
|
||||||
+ // Ensure the default graph is included in the submitted graphs
|
|
||||||
+ graphs.add(defaultGraph);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Start measuring statistics. This will immediately create an async
|
|
||||||
+ * repeating task as the plugin and send the initial data to the metrics
|
|
||||||
+ * backend, and then after that it will post in increments of PING_INTERVAL
|
|
||||||
+ * * 1200 ticks.
|
|
||||||
+ */
|
|
||||||
+ public void start() {
|
|
||||||
+ // Did we opt out?
|
|
||||||
+ if (configuration.getBoolean("opt-out", false)) {
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Begin hitting the server with glorious data
|
|
||||||
+ new TimedThread(new Runnable() {
|
|
||||||
+ private boolean firstPost = true;
|
|
||||||
+
|
|
||||||
+ public void run() {
|
|
||||||
+ try {
|
|
||||||
+ // We use the inverse of firstPost because if it is the first time we are posting,
|
|
||||||
+ // it is not a interval ping, so it evaluates to FALSE
|
|
||||||
+ // Each time thereafter it will evaluate to TRUE, i.e PING!
|
|
||||||
+ postPlugin(!firstPost);
|
|
||||||
+
|
|
||||||
+ // After the first post we set firstPost to false
|
|
||||||
+ // Each post thereafter will be a ping
|
|
||||||
+ firstPost = false;
|
|
||||||
+ } catch (IOException e) {
|
|
||||||
+ System.err.println("[Metrics] " + e.getMessage());
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }, PING_INTERVAL * 60000).start();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Generic method that posts a plugin to the metrics website
|
|
||||||
+ */
|
|
||||||
+ private void postPlugin(boolean isPing) throws IOException {
|
|
||||||
+ // Construct the post data
|
|
||||||
+ String data = encode("guid") + '=' + encode(guid)
|
|
||||||
+ + encodeDataPair("version", "Spigot 1.4")
|
|
||||||
+ + encodeDataPair("server", Bukkit.getVersion())
|
|
||||||
+ + encodeDataPair("players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length))
|
|
||||||
+ + encodeDataPair("revision", String.valueOf(REVISION));
|
|
||||||
+
|
|
||||||
+ // If we're pinging, append it
|
|
||||||
+ if (isPing) {
|
|
||||||
+ data += encodeDataPair("ping", "true");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Acquire a lock on the graphs, which lets us make the assumption we also lock everything
|
|
||||||
+ // inside of the graph (e.g plotters)
|
|
||||||
+ synchronized (graphs) {
|
|
||||||
+ Iterator<Graph> iter = graphs.iterator();
|
|
||||||
+
|
|
||||||
+ while (iter.hasNext()) {
|
|
||||||
+ Graph graph = iter.next();
|
|
||||||
+
|
|
||||||
+ //System.out.println("Sending data for " + graph.getName());
|
|
||||||
+
|
|
||||||
+ // Because we have a lock on the graphs set already, it is reasonable to assume
|
|
||||||
+ // that our lock transcends down to the individual plotters in the graphs also.
|
|
||||||
+ // Because our methods are private, no one but us can reasonably access this list
|
|
||||||
+ // without reflection so this is a safe assumption without adding more code.
|
|
||||||
+ for (Plotter plotter : graph.getPlotters()) {
|
|
||||||
+ // The key name to send to the metrics server
|
|
||||||
+ // The format is C-GRAPHNAME-PLOTTERNAME where separator - is defined at the top
|
|
||||||
+ // Legacy (R4) submitters use the format Custom%s, or CustomPLOTTERNAME
|
|
||||||
+ String key = String.format("C%s%s%s%s", CUSTOM_DATA_SEPARATOR, graph.getName(), CUSTOM_DATA_SEPARATOR, plotter.getColumnName());
|
|
||||||
+
|
|
||||||
+ // The value to send, which for the foreseeable future is just the string
|
|
||||||
+ // value of plotter.getValue()
|
|
||||||
+ String value = Integer.toString(plotter.getValue());
|
|
||||||
+
|
|
||||||
+ //System.out.println("Plotter data for " + plotter.getColumnName() + " is " + plotter.getValue());
|
|
||||||
+
|
|
||||||
+ // Add it to the http post data :)
|
|
||||||
+ data += encodeDataPair(key, value);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Create the url
|
|
||||||
+ URL url = new URL(BASE_URL + String.format(REPORT_URL, "Spigot"));
|
|
||||||
+
|
|
||||||
+ // Connect to the website
|
|
||||||
+ URLConnection connection;
|
|
||||||
+
|
|
||||||
+ // Mineshafter creates a socks proxy, so we can safely bypass it
|
|
||||||
+ // It does not reroute POST requests so we need to go around it
|
|
||||||
+ if (isMineshafterPresent()) {
|
|
||||||
+ connection = url.openConnection(Proxy.NO_PROXY);
|
|
||||||
+ } else {
|
|
||||||
+ connection = url.openConnection();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ connection.setDoOutput(true);
|
|
||||||
+
|
|
||||||
+ // Write the data
|
|
||||||
+ OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
|
|
||||||
+ writer.write(data);
|
|
||||||
+ writer.flush();
|
|
||||||
+
|
|
||||||
+ // System.out.println(data);
|
|
||||||
+
|
|
||||||
+ // Now read the response
|
|
||||||
+ BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
|
|
||||||
+ String response = reader.readLine();
|
|
||||||
+
|
|
||||||
+ // close resources
|
|
||||||
+ writer.close();
|
|
||||||
+ reader.close();
|
|
||||||
+
|
|
||||||
+ if (response.startsWith("ERR")) {
|
|
||||||
+ throw new IOException(response); //Throw the exception
|
|
||||||
+ } else {
|
|
||||||
+ // Is this the first update this hour?
|
|
||||||
+ if (response.contains("OK This is your first update this hour")) {
|
|
||||||
+ synchronized (graphs) {
|
|
||||||
+ Iterator<Graph> iter = graphs.iterator();
|
|
||||||
+
|
|
||||||
+ while (iter.hasNext()) {
|
|
||||||
+ Graph graph = iter.next();
|
|
||||||
+
|
|
||||||
+ for (Plotter plotter : graph.getPlotters()) {
|
|
||||||
+ plotter.reset();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ //if (response.startsWith("OK")) - We should get "OK" followed by an optional description if everything goes right
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Check if mineshafter is present. If it is, we need to bypass it to send
|
|
||||||
+ * POST requests
|
|
||||||
+ *
|
|
||||||
+ * @return
|
|
||||||
+ */
|
|
||||||
+ private boolean isMineshafterPresent() {
|
|
||||||
+ try {
|
|
||||||
+ Class.forName("mineshafter.MineServer");
|
|
||||||
+ return true;
|
|
||||||
+ } catch (Exception e) {
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * <p>Encode a key/value data pair to be used in a HTTP post request. This
|
|
||||||
+ * INCLUDES a & so the first key/value pair MUST be included manually,
|
|
||||||
+ * e.g:</p>
|
|
||||||
+ * <code>
|
|
||||||
+ * String httpData = encode("guid") + '=' + encode("1234") + encodeDataPair("authors") + "..";
|
|
||||||
+ * </code>
|
|
||||||
+ *
|
|
||||||
+ * @param key
|
|
||||||
+ * @param value
|
|
||||||
+ * @return
|
|
||||||
+ */
|
|
||||||
+ private static String encodeDataPair(String key, String value) throws UnsupportedEncodingException {
|
|
||||||
+ return '&' + encode(key) + '=' + encode(value);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Encode text as UTF-8
|
|
||||||
+ *
|
|
||||||
+ * @param text
|
|
||||||
+ * @return
|
|
||||||
+ */
|
|
||||||
+ private static String encode(String text) throws UnsupportedEncodingException {
|
|
||||||
+ return URLEncoder.encode(text, "UTF-8");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Represents a custom graph on the website
|
|
||||||
+ */
|
|
||||||
+ public static class Graph {
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * The graph's name, alphanumeric and spaces only :) If it does not
|
|
||||||
+ * comply to the above when submitted, it is rejected
|
|
||||||
+ */
|
|
||||||
+ private final String name;
|
|
||||||
+ /**
|
|
||||||
+ * The set of plotters that are contained within this graph
|
|
||||||
+ */
|
|
||||||
+ private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
|
|
||||||
+
|
|
||||||
+ public Graph(String name) {
|
|
||||||
+ this.name = name;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Gets the graph's name
|
|
||||||
+ *
|
|
||||||
+ * @return
|
|
||||||
+ */
|
|
||||||
+ public String getName() {
|
|
||||||
+ return name;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Add a plotter to the graph, which will be used to plot entries
|
|
||||||
+ *
|
|
||||||
+ * @param plotter
|
|
||||||
+ */
|
|
||||||
+ public void addPlotter(Plotter plotter) {
|
|
||||||
+ plotters.add(plotter);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Remove a plotter from the graph
|
|
||||||
+ *
|
|
||||||
+ * @param plotter
|
|
||||||
+ */
|
|
||||||
+ public void removePlotter(Plotter plotter) {
|
|
||||||
+ plotters.remove(plotter);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
|
|
||||||
+ *
|
|
||||||
+ * @return
|
|
||||||
+ */
|
|
||||||
+ public Set<Plotter> getPlotters() {
|
|
||||||
+ return Collections.unmodifiableSet(plotters);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public int hashCode() {
|
|
||||||
+ return name.hashCode();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public boolean equals(Object object) {
|
|
||||||
+ if (!(object instanceof Graph)) {
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Graph graph = (Graph) object;
|
|
||||||
+ return graph.name.equals(name);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Interface used to collect custom data for a plugin
|
|
||||||
+ */
|
|
||||||
+ public static abstract class Plotter {
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * The plot's name
|
|
||||||
+ */
|
|
||||||
+ private final String name;
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Construct a plotter with the default plot name
|
|
||||||
+ */
|
|
||||||
+ public Plotter() {
|
|
||||||
+ this("Default");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Construct a plotter with a specific plot name
|
|
||||||
+ *
|
|
||||||
+ * @param name
|
|
||||||
+ */
|
|
||||||
+ public Plotter(String name) {
|
|
||||||
+ this.name = name;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Get the current value for the plotted point
|
|
||||||
+ *
|
|
||||||
+ * @return
|
|
||||||
+ */
|
|
||||||
+ public abstract int getValue();
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Get the column name for the plotted point
|
|
||||||
+ *
|
|
||||||
+ * @return the plotted point's column name
|
|
||||||
+ */
|
|
||||||
+ public String getColumnName() {
|
|
||||||
+ return name;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Called after the website graphs have been updated
|
|
||||||
+ */
|
|
||||||
+ public void reset() {
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public int hashCode() {
|
|
||||||
+ return getColumnName().hashCode() + getValue();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public boolean equals(Object object) {
|
|
||||||
+ if (!(object instanceof Plotter)) {
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Plotter plotter = (Plotter) object;
|
|
||||||
+ return plotter.name.equals(name) && plotter.getValue() == getValue();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/TimedThread.java b/src/main/java/org/bukkit/craftbukkit/util/TimedThread.java
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..d8d2c7c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/TimedThread.java
|
|
||||||
@@ -0,0 +1,37 @@
|
|
||||||
+/*
|
|
||||||
+ * To change this template, choose Tools | Templates
|
|
||||||
+ * and open the template in the editor.
|
|
||||||
+ */
|
|
||||||
+package org.bukkit.craftbukkit.util;
|
|
||||||
+
|
|
||||||
+public class TimedThread extends Thread {
|
|
||||||
+
|
|
||||||
+ final Runnable runnable;
|
|
||||||
+ final long time;
|
|
||||||
+
|
|
||||||
+ public TimedThread(Runnable runnable, long time) {
|
|
||||||
+ super("Spigot Metrics Gathering Thread");
|
|
||||||
+ setDaemon(true);
|
|
||||||
+ this.runnable = runnable;
|
|
||||||
+ this.time = time;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public void run() {
|
|
||||||
+ try {
|
|
||||||
+ sleep(60000);
|
|
||||||
+ } catch (InterruptedException ie) {
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ while (!isInterrupted()) {
|
|
||||||
+ try {
|
|
||||||
+ runnable.run();
|
|
||||||
+ sleep(time);
|
|
||||||
+ } catch (InterruptedException ie) {
|
|
||||||
+ } catch (Exception ex) {
|
|
||||||
+ ex.printStackTrace();
|
|
||||||
+ interrupt();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/WatchdogThread.java b/src/main/java/org/bukkit/craftbukkit/util/WatchdogThread.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/WatchdogThread.java b/src/main/java/org/bukkit/craftbukkit/util/WatchdogThread.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..da6df8f
|
index 0000000..da6df8f
|
||||||
|
|
|
||||||
700
CraftBukkit-Patches/0030-Metrics.patch
Normal file
700
CraftBukkit-Patches/0030-Metrics.patch
Normal file
|
|
@ -0,0 +1,700 @@
|
||||||
|
From 3583a35105b3cbd73efc7c0a9ae240ed87b2d7ec Mon Sep 17 00:00:00 2001
|
||||||
|
From: md_5 <md_5@live.com.au>
|
||||||
|
Date: Sat, 23 Feb 2013 08:58:35 +1100
|
||||||
|
Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the
|
||||||
|
Bukkit version.
|
||||||
|
|
||||||
|
---
|
||||||
|
src/main/java/org/bukkit/craftbukkit/Spigot.java | 11 +
|
||||||
|
src/main/java/org/spigotmc/Metrics.java | 645 +++++++++++++++++++++++
|
||||||
|
2 files changed, 656 insertions(+)
|
||||||
|
create mode 100644 src/main/java/org/spigotmc/Metrics.java
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||||
|
index e0ecf21..537861a 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||||
|
@@ -1,10 +1,15 @@
|
||||||
|
package org.bukkit.craftbukkit;
|
||||||
|
|
||||||
|
+import java.io.IOException;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import net.minecraft.server.*;
|
||||||
|
import org.bukkit.command.SimpleCommandMap;
|
||||||
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
|
import java.util.List;
|
||||||
|
+import java.util.logging.Level;
|
||||||
|
+import java.util.logging.Logger;
|
||||||
|
+import org.bukkit.Bukkit;
|
||||||
|
+import org.spigotmc.Metrics;
|
||||||
|
|
||||||
|
public class Spigot {
|
||||||
|
public static boolean tabPing = false;
|
||||||
|
@@ -42,6 +47,12 @@ public class Spigot {
|
||||||
|
}
|
||||||
|
|
||||||
|
tabPing = configuration.getBoolean("settings.tab-ping", tabPing);
|
||||||
|
+
|
||||||
|
+ try {
|
||||||
|
+ new Metrics().start();
|
||||||
|
+ } catch (IOException ex) {
|
||||||
|
+ Bukkit.getServer().getLogger().log(Level.SEVERE, "Could not start metrics service", ex);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
diff --git a/src/main/java/org/spigotmc/Metrics.java b/src/main/java/org/spigotmc/Metrics.java
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..085df9f
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/main/java/org/spigotmc/Metrics.java
|
||||||
|
@@ -0,0 +1,645 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright 2011-2013 Tyler Blair. All rights reserved.
|
||||||
|
+ *
|
||||||
|
+ * Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
+ * permitted provided that the following conditions are met:
|
||||||
|
+ *
|
||||||
|
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
+ * conditions and the following disclaimer.
|
||||||
|
+ *
|
||||||
|
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
+ * of conditions and the following disclaimer in the documentation and/or other materials
|
||||||
|
+ * provided with the distribution.
|
||||||
|
+ *
|
||||||
|
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||||
|
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||||
|
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
|
||||||
|
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
|
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
|
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
+ *
|
||||||
|
+ * The views and conclusions contained in the software and documentation are those of the
|
||||||
|
+ * authors and contributors and should not be interpreted as representing official policies,
|
||||||
|
+ * either expressed or implied, of anybody else.
|
||||||
|
+ */
|
||||||
|
+package org.spigotmc;
|
||||||
|
+
|
||||||
|
+import org.bukkit.Bukkit;
|
||||||
|
+import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
|
+import org.bukkit.configuration.InvalidConfigurationException;
|
||||||
|
+import org.bukkit.plugin.Plugin;
|
||||||
|
+import org.bukkit.plugin.PluginDescriptionFile;
|
||||||
|
+import org.bukkit.scheduler.BukkitTask;
|
||||||
|
+
|
||||||
|
+import java.io.BufferedReader;
|
||||||
|
+import java.io.File;
|
||||||
|
+import java.io.IOException;
|
||||||
|
+import java.io.InputStreamReader;
|
||||||
|
+import java.io.OutputStreamWriter;
|
||||||
|
+import java.io.UnsupportedEncodingException;
|
||||||
|
+import java.net.Proxy;
|
||||||
|
+import java.net.URL;
|
||||||
|
+import java.net.URLConnection;
|
||||||
|
+import java.net.URLEncoder;
|
||||||
|
+import java.util.Collections;
|
||||||
|
+import java.util.HashSet;
|
||||||
|
+import java.util.Iterator;
|
||||||
|
+import java.util.LinkedHashSet;
|
||||||
|
+import java.util.Set;
|
||||||
|
+import java.util.Timer;
|
||||||
|
+import java.util.TimerTask;
|
||||||
|
+import java.util.UUID;
|
||||||
|
+import java.util.concurrent.TimeUnit;
|
||||||
|
+import java.util.logging.Level;
|
||||||
|
+import net.minecraft.server.MinecraftServer;
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * <p> The metrics class obtains data about a plugin and submits statistics about it to the metrics backend. </p> <p>
|
||||||
|
+ * Public methods provided by this class: </p>
|
||||||
|
+ * <code>
|
||||||
|
+ * Graph createGraph(String name); <br/>
|
||||||
|
+ * void addCustomData(BukkitMetrics.Plotter plotter); <br/>
|
||||||
|
+ * void start(); <br/>
|
||||||
|
+ * </code>
|
||||||
|
+ */
|
||||||
|
+public class Metrics {
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * The current revision number
|
||||||
|
+ */
|
||||||
|
+ private final static int REVISION = 6;
|
||||||
|
+ /**
|
||||||
|
+ * The base url of the metrics domain
|
||||||
|
+ */
|
||||||
|
+ private static final String BASE_URL = "http://mcstats.org";
|
||||||
|
+ /**
|
||||||
|
+ * The url used to report a server's status
|
||||||
|
+ */
|
||||||
|
+ private static final String REPORT_URL = "/report/%s";
|
||||||
|
+ /**
|
||||||
|
+ * The separator to use for custom data. This MUST NOT change unless you are hosting your own version of metrics and
|
||||||
|
+ * want to change it.
|
||||||
|
+ */
|
||||||
|
+ private static final String CUSTOM_DATA_SEPARATOR = "~~";
|
||||||
|
+ /**
|
||||||
|
+ * Interval of time to ping (in minutes)
|
||||||
|
+ */
|
||||||
|
+ private static final int PING_INTERVAL = 10;
|
||||||
|
+ /**
|
||||||
|
+ * All of the custom graphs to submit to metrics
|
||||||
|
+ */
|
||||||
|
+ private final Set<Graph> graphs = Collections.synchronizedSet(new HashSet<Graph>());
|
||||||
|
+ /**
|
||||||
|
+ * The default graph, used for addCustomData when you don't want a specific graph
|
||||||
|
+ */
|
||||||
|
+ private final Graph defaultGraph = new Graph("Default");
|
||||||
|
+ /**
|
||||||
|
+ * The plugin configuration file
|
||||||
|
+ */
|
||||||
|
+ private final YamlConfiguration configuration;
|
||||||
|
+ /**
|
||||||
|
+ * The plugin configuration file
|
||||||
|
+ */
|
||||||
|
+ private final File configurationFile;
|
||||||
|
+ /**
|
||||||
|
+ * Unique server id
|
||||||
|
+ */
|
||||||
|
+ private final String guid;
|
||||||
|
+ /**
|
||||||
|
+ * Debug mode
|
||||||
|
+ */
|
||||||
|
+ private final boolean debug;
|
||||||
|
+ /**
|
||||||
|
+ * Lock for synchronization
|
||||||
|
+ */
|
||||||
|
+ private final Object optOutLock = new Object();
|
||||||
|
+ /**
|
||||||
|
+ * The scheduled task
|
||||||
|
+ */
|
||||||
|
+ private volatile Timer task = null;
|
||||||
|
+
|
||||||
|
+ public Metrics() throws IOException {
|
||||||
|
+ // load the config
|
||||||
|
+ configurationFile = getConfigFile();
|
||||||
|
+ configuration = YamlConfiguration.loadConfiguration(configurationFile);
|
||||||
|
+
|
||||||
|
+ // add some defaults
|
||||||
|
+ configuration.addDefault("opt-out", false);
|
||||||
|
+ configuration.addDefault("guid", UUID.randomUUID().toString());
|
||||||
|
+ configuration.addDefault("debug", false);
|
||||||
|
+
|
||||||
|
+ // Do we need to create the file?
|
||||||
|
+ if (configuration.get("guid", null) == null) {
|
||||||
|
+ configuration.options().header("http://mcstats.org").copyDefaults(true);
|
||||||
|
+ configuration.save(configurationFile);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Load the guid then
|
||||||
|
+ guid = configuration.getString("guid");
|
||||||
|
+ debug = configuration.getBoolean("debug", false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
|
||||||
|
+ * website. Plotters can be added to the graph object returned.
|
||||||
|
+ *
|
||||||
|
+ * @param name The name of the graph
|
||||||
|
+ * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
|
||||||
|
+ */
|
||||||
|
+ public Graph createGraph(final String name) {
|
||||||
|
+ if (name == null) {
|
||||||
|
+ throw new IllegalArgumentException("Graph name cannot be null");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Construct the graph object
|
||||||
|
+ final Graph graph = new Graph(name);
|
||||||
|
+
|
||||||
|
+ // Now we can add our graph
|
||||||
|
+ graphs.add(graph);
|
||||||
|
+
|
||||||
|
+ // and return back
|
||||||
|
+ return graph;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend
|
||||||
|
+ *
|
||||||
|
+ * @param graph The name of the graph
|
||||||
|
+ */
|
||||||
|
+ public void addGraph(final Graph graph) {
|
||||||
|
+ if (graph == null) {
|
||||||
|
+ throw new IllegalArgumentException("Graph cannot be null");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ graphs.add(graph);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Adds a custom data plotter to the default graph
|
||||||
|
+ *
|
||||||
|
+ * @param plotter The plotter to use to plot custom data
|
||||||
|
+ */
|
||||||
|
+ public void addCustomData(final Plotter plotter) {
|
||||||
|
+ if (plotter == null) {
|
||||||
|
+ throw new IllegalArgumentException("Plotter cannot be null");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Add the plotter to the graph o/
|
||||||
|
+ defaultGraph.addPlotter(plotter);
|
||||||
|
+
|
||||||
|
+ // Ensure the default graph is included in the submitted graphs
|
||||||
|
+ graphs.add(defaultGraph);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
|
||||||
|
+ * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
|
||||||
|
+ * ticks.
|
||||||
|
+ *
|
||||||
|
+ * @return True if statistics measuring is running, otherwise false.
|
||||||
|
+ */
|
||||||
|
+ public boolean start() {
|
||||||
|
+ synchronized (optOutLock) {
|
||||||
|
+ // Did we opt out?
|
||||||
|
+ if (isOptOut()) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Is metrics already running?
|
||||||
|
+ if (task != null) {
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Begin hitting the server with glorious data
|
||||||
|
+ task = new Timer("Spigot Metrics Thread", true);
|
||||||
|
+
|
||||||
|
+ task.scheduleAtFixedRate(new TimerTask() {
|
||||||
|
+ private boolean firstPost = true;
|
||||||
|
+
|
||||||
|
+ public void run() {
|
||||||
|
+ try {
|
||||||
|
+ // This has to be synchronized or it can collide with the disable method.
|
||||||
|
+ synchronized (optOutLock) {
|
||||||
|
+ // Disable Task, if it is running and the server owner decided to opt-out
|
||||||
|
+ if (isOptOut() && task != null) {
|
||||||
|
+ task.cancel();
|
||||||
|
+ task = null;
|
||||||
|
+ // Tell all plotters to stop gathering information.
|
||||||
|
+ for (Graph graph : graphs) {
|
||||||
|
+ graph.onOptOut();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // We use the inverse of firstPost because if it is the first time we are posting,
|
||||||
|
+ // it is not a interval ping, so it evaluates to FALSE
|
||||||
|
+ // Each time thereafter it will evaluate to TRUE, i.e PING!
|
||||||
|
+ postPlugin(!firstPost);
|
||||||
|
+
|
||||||
|
+ // After the first post we set firstPost to false
|
||||||
|
+ // Each post thereafter will be a ping
|
||||||
|
+ firstPost = false;
|
||||||
|
+ } catch (IOException e) {
|
||||||
|
+ if (debug) {
|
||||||
|
+ Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }, 0, TimeUnit.MINUTES.toMillis(PING_INTERVAL));
|
||||||
|
+
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Has the server owner denied plugin metrics?
|
||||||
|
+ *
|
||||||
|
+ * @return true if metrics should be opted out of it
|
||||||
|
+ */
|
||||||
|
+ public boolean isOptOut() {
|
||||||
|
+ synchronized (optOutLock) {
|
||||||
|
+ try {
|
||||||
|
+ // Reload the metrics file
|
||||||
|
+ configuration.load(getConfigFile());
|
||||||
|
+ } catch (IOException ex) {
|
||||||
|
+ if (debug) {
|
||||||
|
+ Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
|
||||||
|
+ }
|
||||||
|
+ return true;
|
||||||
|
+ } catch (InvalidConfigurationException ex) {
|
||||||
|
+ if (debug) {
|
||||||
|
+ Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
|
||||||
|
+ }
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ return configuration.getBoolean("opt-out", false);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
|
||||||
|
+ *
|
||||||
|
+ * @throws java.io.IOException
|
||||||
|
+ */
|
||||||
|
+ public void enable() throws IOException {
|
||||||
|
+ // This has to be synchronized or it can collide with the check in the task.
|
||||||
|
+ synchronized (optOutLock) {
|
||||||
|
+ // Check if the server owner has already set opt-out, if not, set it.
|
||||||
|
+ if (isOptOut()) {
|
||||||
|
+ configuration.set("opt-out", false);
|
||||||
|
+ configuration.save(configurationFile);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Enable Task, if it is not running
|
||||||
|
+ if (task == null) {
|
||||||
|
+ start();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
|
||||||
|
+ *
|
||||||
|
+ * @throws java.io.IOException
|
||||||
|
+ */
|
||||||
|
+ public void disable() throws IOException {
|
||||||
|
+ // This has to be synchronized or it can collide with the check in the task.
|
||||||
|
+ synchronized (optOutLock) {
|
||||||
|
+ // Check if the server owner has already set opt-out, if not, set it.
|
||||||
|
+ if (!isOptOut()) {
|
||||||
|
+ configuration.set("opt-out", true);
|
||||||
|
+ configuration.save(configurationFile);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Disable Task, if it is running
|
||||||
|
+ if (task != null) {
|
||||||
|
+ task.cancel();
|
||||||
|
+ task = null;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status
|
||||||
|
+ *
|
||||||
|
+ * @return the File object for the config file
|
||||||
|
+ */
|
||||||
|
+ public File getConfigFile() {
|
||||||
|
+ // I believe the easiest way to get the base folder (e.g craftbukkit set via -P) for plugins to use
|
||||||
|
+ // is to abuse the plugin object we already have
|
||||||
|
+ // plugin.getDataFolder() => base/plugins/PluginA/
|
||||||
|
+ // pluginsFolder => base/plugins/
|
||||||
|
+ // The base is not necessarily relative to the startup directory.
|
||||||
|
+ // File pluginsFolder = plugin.getDataFolder().getParentFile();
|
||||||
|
+
|
||||||
|
+ // return => base/plugins/PluginMetrics/config.yml
|
||||||
|
+ return new File(new File((File) MinecraftServer.getServer().options.valueOf("plugins"), "PluginMetrics"), "config.yml");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Generic method that posts a plugin to the metrics website
|
||||||
|
+ */
|
||||||
|
+ private void postPlugin(final boolean isPing) throws IOException {
|
||||||
|
+ // Server software specific section
|
||||||
|
+ String pluginName = "Spigot";
|
||||||
|
+ boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
|
||||||
|
+ String pluginVersion = (Metrics.class.getPackage() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
|
||||||
|
+ String serverVersion = Bukkit.getVersion();
|
||||||
|
+ int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
|
||||||
|
+
|
||||||
|
+ // END server software specific section -- all code below does not use any code outside of this class / Java
|
||||||
|
+
|
||||||
|
+ // Construct the post data
|
||||||
|
+ final StringBuilder data = new StringBuilder();
|
||||||
|
+
|
||||||
|
+ // The plugin's description file containg all of the plugin data such as name, version, author, etc
|
||||||
|
+ data.append(encode("guid")).append('=').append(encode(guid));
|
||||||
|
+ encodeDataPair(data, "version", pluginVersion);
|
||||||
|
+ encodeDataPair(data, "server", serverVersion);
|
||||||
|
+ encodeDataPair(data, "players", Integer.toString(playersOnline));
|
||||||
|
+ encodeDataPair(data, "revision", String.valueOf(REVISION));
|
||||||
|
+
|
||||||
|
+ // New data as of R6
|
||||||
|
+ String osname = System.getProperty("os.name");
|
||||||
|
+ String osarch = System.getProperty("os.arch");
|
||||||
|
+ String osversion = System.getProperty("os.version");
|
||||||
|
+ String java_version = System.getProperty("java.version");
|
||||||
|
+ int coreCount = Runtime.getRuntime().availableProcessors();
|
||||||
|
+
|
||||||
|
+ // normalize os arch .. amd64 -> x86_64
|
||||||
|
+ if (osarch.equals("amd64")) {
|
||||||
|
+ osarch = "x86_64";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ encodeDataPair(data, "osname", osname);
|
||||||
|
+ encodeDataPair(data, "osarch", osarch);
|
||||||
|
+ encodeDataPair(data, "osversion", osversion);
|
||||||
|
+ encodeDataPair(data, "cores", Integer.toString(coreCount));
|
||||||
|
+ encodeDataPair(data, "online-mode", Boolean.toString(onlineMode));
|
||||||
|
+ encodeDataPair(data, "java_version", java_version);
|
||||||
|
+
|
||||||
|
+ // If we're pinging, append it
|
||||||
|
+ if (isPing) {
|
||||||
|
+ encodeDataPair(data, "ping", "true");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Acquire a lock on the graphs, which lets us make the assumption we also lock everything
|
||||||
|
+ // inside of the graph (e.g plotters)
|
||||||
|
+ synchronized (graphs) {
|
||||||
|
+ final Iterator<Graph> iter = graphs.iterator();
|
||||||
|
+
|
||||||
|
+ while (iter.hasNext()) {
|
||||||
|
+ final Graph graph = iter.next();
|
||||||
|
+
|
||||||
|
+ for (Plotter plotter : graph.getPlotters()) {
|
||||||
|
+ // The key name to send to the metrics server
|
||||||
|
+ // The format is C-GRAPHNAME-PLOTTERNAME where separator - is defined at the top
|
||||||
|
+ // Legacy (R4) submitters use the format Custom%s, or CustomPLOTTERNAME
|
||||||
|
+ final String key = String.format("C%s%s%s%s", CUSTOM_DATA_SEPARATOR, graph.getName(), CUSTOM_DATA_SEPARATOR, plotter.getColumnName());
|
||||||
|
+
|
||||||
|
+ // The value to send, which for the foreseeable future is just the string
|
||||||
|
+ // value of plotter.getValue()
|
||||||
|
+ final String value = Integer.toString(plotter.getValue());
|
||||||
|
+
|
||||||
|
+ // Add it to the http post data :)
|
||||||
|
+ encodeDataPair(data, key, value);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Create the url
|
||||||
|
+ URL url = new URL(BASE_URL + String.format(REPORT_URL, encode(pluginName)));
|
||||||
|
+
|
||||||
|
+ // Connect to the website
|
||||||
|
+ URLConnection connection;
|
||||||
|
+
|
||||||
|
+ // Mineshafter creates a socks proxy, so we can safely bypass it
|
||||||
|
+ // It does not reroute POST requests so we need to go around it
|
||||||
|
+ if (isMineshafterPresent()) {
|
||||||
|
+ connection = url.openConnection(Proxy.NO_PROXY);
|
||||||
|
+ } else {
|
||||||
|
+ connection = url.openConnection();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ connection.setDoOutput(true);
|
||||||
|
+
|
||||||
|
+ // Write the data
|
||||||
|
+ final OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
|
||||||
|
+ writer.write(data.toString());
|
||||||
|
+ writer.flush();
|
||||||
|
+
|
||||||
|
+ // Now read the response
|
||||||
|
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
|
||||||
|
+ final String response = reader.readLine();
|
||||||
|
+
|
||||||
|
+ // close resources
|
||||||
|
+ writer.close();
|
||||||
|
+ reader.close();
|
||||||
|
+
|
||||||
|
+ if (response == null || response.startsWith("ERR")) {
|
||||||
|
+ throw new IOException(response); //Throw the exception
|
||||||
|
+ } else {
|
||||||
|
+ // Is this the first update this hour?
|
||||||
|
+ if (response.contains("OK This is your first update this hour")) {
|
||||||
|
+ synchronized (graphs) {
|
||||||
|
+ final Iterator<Graph> iter = graphs.iterator();
|
||||||
|
+
|
||||||
|
+ while (iter.hasNext()) {
|
||||||
|
+ final Graph graph = iter.next();
|
||||||
|
+
|
||||||
|
+ for (Plotter plotter : graph.getPlotters()) {
|
||||||
|
+ plotter.reset();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
|
||||||
|
+ *
|
||||||
|
+ * @return true if mineshafter is installed on the server
|
||||||
|
+ */
|
||||||
|
+ private boolean isMineshafterPresent() {
|
||||||
|
+ try {
|
||||||
|
+ Class.forName("mineshafter.MineServer");
|
||||||
|
+ return true;
|
||||||
|
+ } catch (Exception e) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * <p>Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first key/value pair
|
||||||
|
+ * MUST be included manually, e.g:</p>
|
||||||
|
+ * <code>
|
||||||
|
+ * StringBuffer data = new StringBuffer();
|
||||||
|
+ * data.append(encode("guid")).append('=').append(encode(guid));
|
||||||
|
+ * encodeDataPair(data, "version", description.getVersion());
|
||||||
|
+ * </code>
|
||||||
|
+ *
|
||||||
|
+ * @param buffer the stringbuilder to append the data pair onto
|
||||||
|
+ * @param key the key value
|
||||||
|
+ * @param value the value
|
||||||
|
+ */
|
||||||
|
+ private static void encodeDataPair(final StringBuilder buffer, final String key, final String value) throws UnsupportedEncodingException {
|
||||||
|
+ buffer.append('&').append(encode(key)).append('=').append(encode(value));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Encode text as UTF-8
|
||||||
|
+ *
|
||||||
|
+ * @param text the text to encode
|
||||||
|
+ * @return the encoded text, as UTF-8
|
||||||
|
+ */
|
||||||
|
+ private static String encode(final String text) throws UnsupportedEncodingException {
|
||||||
|
+ return URLEncoder.encode(text, "UTF-8");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Represents a custom graph on the website
|
||||||
|
+ */
|
||||||
|
+ public static class Graph {
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
|
||||||
|
+ * rejected
|
||||||
|
+ */
|
||||||
|
+ private final String name;
|
||||||
|
+ /**
|
||||||
|
+ * The set of plotters that are contained within this graph
|
||||||
|
+ */
|
||||||
|
+ private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
|
||||||
|
+
|
||||||
|
+ private Graph(final String name) {
|
||||||
|
+ this.name = name;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the graph's name
|
||||||
|
+ *
|
||||||
|
+ * @return the Graph's name
|
||||||
|
+ */
|
||||||
|
+ public String getName() {
|
||||||
|
+ return name;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Add a plotter to the graph, which will be used to plot entries
|
||||||
|
+ *
|
||||||
|
+ * @param plotter the plotter to add to the graph
|
||||||
|
+ */
|
||||||
|
+ public void addPlotter(final Plotter plotter) {
|
||||||
|
+ plotters.add(plotter);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Remove a plotter from the graph
|
||||||
|
+ *
|
||||||
|
+ * @param plotter the plotter to remove from the graph
|
||||||
|
+ */
|
||||||
|
+ public void removePlotter(final Plotter plotter) {
|
||||||
|
+ plotters.remove(plotter);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
|
||||||
|
+ *
|
||||||
|
+ * @return an unmodifiable {@link java.util.Set} of the plotter objects
|
||||||
|
+ */
|
||||||
|
+ public Set<Plotter> getPlotters() {
|
||||||
|
+ return Collections.unmodifiableSet(plotters);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public int hashCode() {
|
||||||
|
+ return name.hashCode();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean equals(final Object object) {
|
||||||
|
+ if (!(object instanceof Graph)) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ final Graph graph = (Graph) object;
|
||||||
|
+ return graph.name.equals(name);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
|
||||||
|
+ */
|
||||||
|
+ protected void onOptOut() {
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Interface used to collect custom data for a plugin
|
||||||
|
+ */
|
||||||
|
+ public static abstract class Plotter {
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * The plot's name
|
||||||
|
+ */
|
||||||
|
+ private final String name;
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Construct a plotter with the default plot name
|
||||||
|
+ */
|
||||||
|
+ public Plotter() {
|
||||||
|
+ this("Default");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Construct a plotter with a specific plot name
|
||||||
|
+ *
|
||||||
|
+ * @param name the name of the plotter to use, which will show up on the website
|
||||||
|
+ */
|
||||||
|
+ public Plotter(final String name) {
|
||||||
|
+ this.name = name;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Get the current value for the plotted point. Since this function defers to an external function it may or may
|
||||||
|
+ * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
|
||||||
|
+ * from any thread so care should be taken when accessing resources that need to be synchronized.
|
||||||
|
+ *
|
||||||
|
+ * @return the current value for the point to be plotted.
|
||||||
|
+ */
|
||||||
|
+ public abstract int getValue();
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Get the column name for the plotted point
|
||||||
|
+ *
|
||||||
|
+ * @return the plotted point's column name
|
||||||
|
+ */
|
||||||
|
+ public String getColumnName() {
|
||||||
|
+ return name;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Called after the website graphs have been updated
|
||||||
|
+ */
|
||||||
|
+ public void reset() {
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public int hashCode() {
|
||||||
|
+ return getColumnName().hashCode();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean equals(final Object object) {
|
||||||
|
+ if (!(object instanceof Plotter)) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ final Plotter plotter = (Plotter) object;
|
||||||
|
+ return plotter.name.equals(name) && plotter.getValue() == getValue();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
\ No newline at end of file
|
||||||
|
--
|
||||||
|
1.8.1-rc2
|
||||||
|
|
||||||
Loading…
Reference in a new issue