Some refactoring so that short-circuit build env model does not need …

…full daemon services.
hlship · Jan 23, 2012 · fc4f9b9 · fc4f9b9
1 parent ed38fd1
commit fc4f9b9
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/...ojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultConnection.java b/...ojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultConnection.java
@@ -87,11 +87,11 @@ public <T> T getTheModel(Class<T> type, BuildOperationParametersVersion1 paramet
         if (type == InternalBuildEnvironment.class) {
 
             //we don't really need to launch gradle to acquire information needed for BuildEnvironment
-            DaemonClientServices services = daemonClientServices(adaptedParameters);
+            DaemonParameters daemonParameters = init(adaptedParameters);
             DefaultBuildEnvironment out = new DefaultBuildEnvironment(
                 GradleVersion.current().getVersion(),
-                services.getDaemonParameters().getEffectiveJavaHome(),
-                services.getDaemonParameters().getJvmArgs());
+                daemonParameters.getEffectiveJavaHome(),
+                daemonParameters.getJvmArgs());
 
             return type.cast(out);
         }
@@ -110,7 +110,12 @@ private GradleLauncherActionExecuter<ProviderOperationParameters> createExecuter
         if (Boolean.TRUE.equals(operationParameters.isEmbedded())) {
             return embeddedExecuterSupport.getExecuter();
         } else {
-            DaemonClientServices clientServices = daemonClientServices(operationParameters);
+            LoggingServiceRegistry loggingServices = LoggingServiceRegistry.newEmbeddableLogging();
+
+            loggingServices.get(OutputEventRenderer.class).configure(operationParameters.getBuildLogLevel());
+
+            DaemonParameters daemonParams = init(operationParameters);
+            DaemonClientServices clientServices = new DaemonClientServices(loggingServices, daemonParams, operationParameters.getStandardInput());
             DaemonClient client = clientServices.get(DaemonClient.class);
 
             GradleLauncherActionExecuter<ProviderOperationParameters> executer = new DaemonGradleLauncherActionExecuter(client, clientServices.getDaemonParameters());
@@ -120,10 +125,7 @@ private GradleLauncherActionExecuter<ProviderOperationParameters> createExecuter
         }
     }
 
-    private DaemonClientServices daemonClientServices(ProviderOperationParameters operationParameters) {
-        LoggingServiceRegistry loggingServices = LoggingServiceRegistry.newEmbeddableLogging();
-
-        loggingServices.get(OutputEventRenderer.class).configure(operationParameters.getBuildLogLevel());
+    private DaemonParameters init(ProviderOperationParameters operationParameters) {
         slf4jLoggingConfigurer.configure(operationParameters.getProviderLogLevel());
 
         File gradleUserHomeDir = GUtil.elvis(operationParameters.getGradleUserHomeDir(), StartParameter.DEFAULT_GRADLE_USER_HOME);
@@ -144,6 +146,6 @@ private DaemonClientServices daemonClientServices(ProviderOperationParameters op
             int idleTimeout = (int) operationParameters.getDaemonMaxIdleTimeUnits().toMillis(operationParameters.getDaemonMaxIdleTimeValue());
             daemonParams.setIdleTimeout(idleTimeout);
         }
-        return new DaemonClientServices(loggingServices, daemonParams, operationParameters.getStandardInput());
+        return daemonParams;
     }
-}
+}