---

mziccard · mziccard · commit afa77eaf66fe · 2015-09-17T14:32:34.000+02:00
yaml --- r: 6129 b: refs/heads/tswast-patch-1 c: b0a88f5 h: refs/heads/master i: 6127: 8ec499c
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 1c52730edfb6e169ea9ce8af32713f4879f07590
+refs/heads/tswast-patch-1: b0a88f5d512908159d5c7316f363d4a1afb97658
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java b/branches/tswast-patch-1/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java
@@ -55,11 +55,16 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * Utility to start and stop local Google Cloud Datastore process.
  */
 public class LocalGcdHelper {
   
+  private static final Logger log = Logger.getLogger(LocalGcdHelper.class.getName());
+
   private final String projectId;
   private Path gcdPath;
   private ProcessStreamReader processReader;
@@ -99,14 +104,27 @@ private static Path installedGcdPath() {
     Path gcloudPath = executablePath(gcloudExecutableName);
     gcloudPath = (gcloudPath == null) ? null : gcloudPath.getParent();
     if (gcloudPath == null) {
+      if (log.isLoggable(Level.FINE)) {
+        log.fine("SDK not found");
+      }
       return null;
     }
+    if (log.isLoggable(Level.FINE)) {
+      log.fine("SDK found, looking for datastore emulator");
+    }
     Path installedGcdPath = gcloudPath.resolve("platform").resolve("gcd");
     if (Files.exists(installedGcdPath)) {
       try {
         String installedVersion = installedGcdVersion();
         if (installedVersion != null && installedVersion.startsWith(GCD_VERSION)) {
+          if (log.isLoggable(Level.FINE)) {
+            log.fine("SDK datastore emulator found");
+          }
           return installedGcdPath;
+        } else {
+          if (log.isLoggable(Level.FINE)) {
+            log.fine("SDK datastore emulator found but version mismatch");
+          }
         }
       } catch (IOException | InterruptedException ignore) {
         // ignore
@@ -308,14 +326,23 @@ private void downloadGcd() throws IOException {
     // check if we already have a local copy of the gcd utility and download it if not.
     File gcdZipFile = new File(System.getProperty("java.io.tmpdir"), GCD_FILENAME);
     if (!gcdZipFile.exists() || !MD5_CHECKSUM.equals(md5(gcdZipFile))) {
+      if (log.isLoggable(Level.FINE)) {
+        log.fine("Fetching datastore emulator");
+      }
       ReadableByteChannel rbc = Channels.newChannel(GCD_URL.openStream());
       try (FileOutputStream fos = new FileOutputStream(gcdZipFile)) {
         fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
       }
+    } else {
+      if (log.isLoggable(Level.FINE)) {
+        log.fine("Using cached datastore emulator");
+      }      
     }
-    
     // unzip the gcd
     try (ZipInputStream zipIn = new ZipInputStream(new FileInputStream(gcdZipFile))) {
+      if (log.isLoggable(Level.FINE)) {
+        log.fine("Unzipping datastore emulator");
+      }
       ZipEntry entry = zipIn.getNextEntry();
       while (entry != null) {
         File filePath = new File(gcdPath.toFile(), entry.getName());
@@ -350,6 +377,9 @@ private void startGcd(Path executablePath) throws IOException, InterruptedExcept
     }
 
     // create the datastore for the project
+    if (log.isLoggable(Level.FINE)) {
+      log.log(Level.FINE, "Creating datastore for the project: {0}", projectId);
+    }
     Process temp = gcdCreateCommand.command(gcdAbsolutePath.toString(), "create", "-p", projectId,
             projectId)
             .redirectErrorInherit()
@@ -359,6 +389,9 @@ private void startGcd(Path executablePath) throws IOException, InterruptedExcept
     temp.waitFor();
 
     // start the datastore for the project
+    if (log.isLoggable(Level.FINE)) {
+      log.log(Level.FINE, "Starting datastore emulator for the project: {0}", projectId);
+    }
     temp = gcdStartCommand.command(gcdAbsolutePath.toString(), "start", "--testing",
             "--allow_remote_shutdown", projectId)
             .directory(gcdPath)
