Optionally fetch the zone when generating ping responses from Tiltyard

request farm backends.
Whisprin · Nov 24, 2013 · a6fde11 · a6fde11
1 parent 1ba33d0
commit a6fde11
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm.java b/src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm.java
@@ -67,8 +67,16 @@ static EncodedKeyPair getKeyPair(String keyPairString) {
     }
     public static final EncodedKeyPair theBackendKeys = getKeyPair(FileUtils.readFileAsString(new File("src/org/ggp/base/apps/tiltyard/BackendKeys.json")));
     public static String generateSignedPing() {
+    	String zone = null;
+   		try {
+			zone = RemoteResourceLoader.loadRaw("http://metadata/computeMetadata/v1beta1/instance/zone");
+		} catch (IOException e1) {
+			// If we can't acquire the request farm zone, just silently drop it.
+		}
+
         JSONObject thePing = new JSONObject();
         try {
+        	if (zone != null) thePing.put("zone", zone);
             thePing.put("lastTimeBlock", (System.currentTimeMillis() / 3600000));
             thePing.put("nextTimeBlock", (System.currentTimeMillis() / 3600000)+1);
             SignableJSON.signJSON(thePing, theBackendKeys.thePublicKey, theBackendKeys.thePrivateKey);