SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java‎
Lines changed: 18 additions & 7 deletions b/‎java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java‎
Lines changed: 18 additions & 7 deletions
diff --git a/‎java/client/src/org/openqa/selenium/remote/service/DriverService.java‎
Lines changed: 7 additions & 1 deletion b/‎java/client/src/org/openqa/selenium/remote/service/DriverService.java‎
Lines changed: 7 additions & 1 deletion
@@ -27,6 +27,7 @@
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
 
@@ -78,6 +79,7 @@ public static class Builder extends DriverService.Builder<
     GeckoDriverService, GeckoDriverService.Builder> {
 
     private FirefoxBinary binary;
+
     public Builder() {
       this(new FirefoxBinary());
     }
@@ -101,10 +103,6 @@ protected File findDefaultExecutable() {
     protected ImmutableList<String> createArgs() {
       ImmutableList.Builder<String> argsBuilder = ImmutableList.builder();
       argsBuilder.add(String.format("--port=%d", getPort()));
-      if (getLogFile() != null) {
-        // TODO: watch https://github.com/mozilla/geckodriver/issues/415
-        //argsBuilder.add(String.format("--log-file=\"%s\"", getLogFile().getAbsolutePath()));
-      }
       try {
         argsBuilder.add("-b");
         argsBuilder.add(binary.getPath());
@@ -117,10 +115,23 @@ protected ImmutableList<String> createArgs() {
 
     @Override
     protected GeckoDriverService createDriverService(File exe, int port,
-                                                                ImmutableList<String> args,
-                                                                ImmutableMap<String, String> environment) {
+                                                     ImmutableList<String> args,
+                                                     ImmutableMap<String, String> environment) {
       try {
-        return new GeckoDriverService(exe, port, args, environment);
+        GeckoDriverService service = new GeckoDriverService(exe, port, args, environment);
+        if (getLogFile() !=  null) {
+          service.sendOutputTo(new FileOutputStream(getLogFile()));
+        } else {
+          String firefoxLogFile = System.getProperty(FirefoxDriver.SystemProperty.BROWSER_LOGFILE);
+          if (firefoxLogFile != null) {
+            if ("/dev/stdout".equals(firefoxLogFile)) {
+              service.sendOutputTo(System.out);
+            }
+            service.sendOutputTo(new FileOutputStream(firefoxLogFile));
+          }
+
+        }
+        return service;
       } catch (IOException e) {
         throw new WebDriverException(e);
       }
 
@@ -34,6 +34,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
@@ -68,6 +69,7 @@ public class DriverService {
   private final String executable;
   private final ImmutableList<String> args;
   private final ImmutableMap<String, String> environment;
+  private OutputStream outputStream = System.err;
 
   /**
   *
@@ -160,7 +162,7 @@ public void start() throws IOException {
       }
       process = new CommandLine(this.executable, args.toArray(new String[] {}));
       process.setEnvironmentVariables(environment);
-      process.copyOutputTo(System.err);
+      process.copyOutputTo(outputStream);
       process.executeAsync();
 
       waitUntilAvailable();
@@ -204,6 +206,10 @@ public void stop() {
     }
   }
 
+  public void sendOutputTo(OutputStream outputStream) {
+    this.outputStream = outputStream;
+  }
+
   public static abstract class Builder<DS extends DriverService, B extends Builder> {
 
     private int port = 0;