You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jz...@apache.org on 2009/11/26 04:12:13 UTC
svn commit: r884391 - in /continuum/trunk:
continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/
continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/
continuum-co...
Author: jzurbano
Date: Thu Nov 26 03:12:11 2009
New Revision: 884391
URL: http://svn.apache.org/viewvc?rev=884391&view=rev
Log:
[CONTINUUM-2373] - Distributed Master needs more detailed logging
* added project/group/release IDs in the logs both in master and slave
* added logs in some methods that do not have one
* created ContinuumDistributedUtil class for retrieving values from "Map<String, Object>" variables
Added:
continuum/trunk/continuum-distributed/continuum-distributed-commons/
continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml (with props)
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/
continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java (with props)
Modified:
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java
continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java
continuum/trunk/continuum-distributed/continuum-distributed-master/pom.xml
continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
continuum/trunk/continuum-distributed/pom.xml
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Thu Nov 26 03:12:11 2009
@@ -103,7 +103,7 @@
int projectId = buildProjectTask.getProjectId();
- log.info( "Initializing build" );
+ log.info( "Initializing build (projectId=" + projectId + ")" );
BuildContext context = buildContextManager.getBuildContext( projectId );
initializeBuildContext( context );
Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java Thu Nov 26 03:12:11 2009
@@ -104,7 +104,7 @@
{
SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) );
- log.info( "initializing buildContext" );
+ log.info( "initializing buildContext for projectGroupId=" + prepareBuildTask.getProjectGroupId() );
List<Map<String, Object>> buildContext =
initializeBuildContext( prepareBuildTask.getProjectsBuildDefinitionsMap(),
prepareBuildTask.getBuildTrigger(), prepareBuildTask.getScmRootAddress(),
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java Thu Nov 26 03:12:11 2009
@@ -226,17 +226,18 @@
}
catch ( ContinuumStoreException e )
{
- log.error( "Error while updating project's state", e );
- throw new ContinuumException( "Error while updating project's state", e );
+ log.error( "Error while updating project's state (projectId=" + projectId + ")", e );
+ throw new ContinuumException( "Error while updating project's state (projectId=" + projectId + ")", e );
}
}
public void startPrepareBuild( Map<String, Object> context )
throws ContinuumException
{
+ int projectGroupId = ContinuumBuildConstant.getProjectGroupId( context );
+
try
{
- int projectGroupId = ContinuumBuildConstant.getProjectGroupId( context );
String scmRootAddress = ContinuumBuildConstant.getScmRootAddress( context );
ProjectScmRoot scmRoot =
@@ -247,8 +248,8 @@
}
catch ( ContinuumStoreException e )
{
- log.error( "Error while updating project scm root's state", e );
- throw new ContinuumException( "Error while updating project scm root's state", e );
+ log.error( "Error while updating project group'" + projectGroupId + "' scm root's state", e );
+ throw new ContinuumException( "Error while updating project group'" + projectGroupId + "' scm root's state", e );
}
}
@@ -334,16 +335,17 @@
}
catch ( ContinuumStoreException e )
{
- throw new ContinuumException( "Unable to update project from working copy", e );
+ throw new ContinuumException( "Unable to update project '" + ContinuumBuildConstant.getProjectId( context ) +
+ "' from working copy", e );
}
}
public boolean shouldBuild( Map<String, Object> context )
{
+ int projectId = ContinuumBuildConstant.getProjectId( context );
+
try
{
- int projectId = ContinuumBuildConstant.getProjectId( context );
-
int buildDefinitionId = ContinuumBuildConstant.getBuildDefinitionId( context );
int trigger = ContinuumBuildConstant.getTrigger( context );
@@ -361,17 +363,17 @@
if ( buildDefinition.isBuildFresh() )
{
- log.info( "FreshBuild configured, building" );
+ log.info( "FreshBuild configured, building (projectId=" + projectId + ")" );
return true;
}
if ( buildDefinition.isAlwaysBuild() )
{
- log.info( "AlwaysBuild configured, building" );
+ log.info( "AlwaysBuild configured, building (projectId=" + projectId + ")" );
return true;
}
if ( oldBuildResult == null )
{
- log.info( "The project was never be built with the current build definition, building" );
+ log.info( "The project '" + projectId + "' was never built with the current build definition, building" );
return true;
}
@@ -379,26 +381,26 @@
if ( project.getOldState() == ContinuumProjectState.ERROR ||
oldBuildResult.getState() == ContinuumProjectState.ERROR )
{
- log.info( "Latest state was 'ERROR', building" );
+ log.info( "Latest state was 'ERROR', building (projectId=" + projectId + ")" );
return true;
}
if ( trigger == ContinuumProjectState.TRIGGER_FORCED )
{
- log.info( "The project build is forced, building" );
+ log.info( "The project '" + projectId + "' build is forced, building" );
return true;
}
Date date = ContinuumBuildConstant.getLatestUpdateDate( context );
if ( date != null && oldBuildResult.getLastChangedDate() >= date.getTime() )
{
- log.info( "No changes found,not building" );
+ log.info( "No changes found, not building (projectId=" + projectId + ")" );
return false;
}
else if ( date != null && changes.isEmpty() )
{
// fresh checkout from build agent that's why changes is empty
- log.info( "Changes found in the current project, building" );
+ log.info( "Changes found in the current project, building (projectId=" + projectId + ")" );
return true;
}
@@ -418,20 +420,20 @@
{
if ( !changes.isEmpty() )
{
- log.info(
- "The project was not built because all changes are unknown (maybe local modifications or ignored files not defined in your SCM tool." );
+ log.info( "The project '" + projectId +
+ "' was not built because all changes are unknown (maybe local modifications or ignored files not defined in your SCM tool." );
}
else
{
- log.info(
- "The project was not built because no changes were detected in sources since the last build." );
+ log.info( "The project '" + projectId +
+ "' was not built because no changes were detected in sources since the last build." );
}
}
// Check dependencies changes
if ( modifiedDependencies != null && !modifiedDependencies.isEmpty() )
{
- log.info( "Found dependencies changes, building" );
+ log.info( "Found dependencies changes, building (projectId=" + projectId + ")" );
shouldBuild = true;
}
}
@@ -446,22 +448,22 @@
if ( shouldBuild )
{
- log.info( "Changes found in the current project, building" );
+ log.info( "Changes found in the current project, building (projectId=" + projectId + ")" );
}
else
{
- log.info( "No changes in the current project, not building" );
+ log.info( "No changes in the current project, not building (projectId=" + projectId + ")" );
}
return shouldBuild;
}
catch ( ContinuumStoreException e )
{
- log.error( "Failed to determine if project should build", e );
+ log.error( "Failed to determine if project '" + projectId + "' should build", e );
}
catch ( ContinuumException e )
{
- log.error( "Failed to determine if project should build", e );
+ log.error( "Failed to determine if project '" + projectId + "' should build", e );
}
return false;
@@ -482,14 +484,15 @@
{
if ( log.isInfoEnabled() )
{
- log.info( "recursive build and changes found --> building" );
+ log.info( "recursive build and changes found --> building (projectId=" + project.getId() + ")" );
}
return true;
}
if ( !project.getVersion().equals( mavenProjectVersion ) )
{
- log.info( "Found changes in project's version ( maybe project was recently released ), building" );
+ log.info( "Found changes in project's version ( maybe project '" + project.getId() +
+ "' was recently released ), building" );
return true;
}
@@ -497,7 +500,7 @@
{
if ( log.isInfoEnabled() )
{
- log.info( "Found no changes, not building" );
+ log.info( "Found no changes, not building (projectId=" + project.getId() + ")" );
}
return false;
}
@@ -549,7 +552,7 @@
if ( !shouldBuild )
{
- log.info( "Changes are only in sub-modules." );
+ log.info( "Changes are only in sub-modules (projectId=" + project.getId() + ")." );
}
if ( log.isDebugEnabled() )
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java Thu Nov 26 03:12:11 2009
@@ -748,7 +748,7 @@
return true;
}
- log.info( "Build agent: " + buildAgentUrl + "is either disabled or removed" );
+ log.info( "Build agent: " + buildAgentUrl + " is either disabled or removed" );
return false;
}
}
\ No newline at end of file
Added: continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml?rev=884391&view=auto
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml (added)
+++ continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml Thu Nov 26 03:12:11 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>continuum-distributed</artifactId>
+ <groupId>org.apache.continuum</groupId>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>continuum-distributed-commons</artifactId>
+ <name>Continuum :: Distributed Build :: Commons</name>
+</project>
Propchange: continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java?rev=884391&view=auto
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java (added)
+++ continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java Thu Nov 26 03:12:11 2009
@@ -0,0 +1,111 @@
+package org.apache.continuum.distributed.commons.utils;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Map;
+
+/**
+ * ContinuumDistributedUtil
+ */
+public class ContinuumDistributedUtil
+{
+ public static final String KEY_PROJECT_ID = "project-id";
+
+ public static final String KEY_PROJECT_NAME = "project-name";
+
+ public static final String KEY_ARTIFACT_ID = "artifact-id";
+
+ public static int getProjectId( Map<String, Object> context )
+ {
+ return getInteger( context, KEY_PROJECT_ID );
+ }
+
+ public static String getArtifactId( Map<String, Object> context )
+ {
+ return getString( context, KEY_ARTIFACT_ID );
+ }
+
+ public static String getProjectName( Map<String, Object> context )
+ {
+ return getString( context, KEY_PROJECT_NAME );
+ }
+
+ public static String getProjectNameAndId( Map<String, Object> context )
+ {
+ StringBuilder result = new StringBuilder();
+
+ if ( getProjectName( context ) != null )
+ {
+ result.append( getProjectName( context ) ).append( " " );
+ }
+ else if ( getArtifactId( context ) != null )
+ {
+ result.append( getArtifactId( context ) ).append( " " );
+ }
+ result.append( "(projectId=" ).append( getProjectId( context ) ).append( ")" );
+
+ return result.toString();
+ }
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ private static String getString( Map<String, Object> context, String key )
+ {
+ Object obj = getObject( context, key, null );
+
+ if ( obj == null )
+ {
+ return null;
+ }
+ else
+ {
+ return (String) obj;
+ }
+ }
+
+ private static int getInteger( Map<String, Object> context, String key )
+ {
+ Object obj = getObject( context, key, null );
+
+ if ( obj == null )
+ {
+ return 0;
+ }
+ else
+ {
+ return (Integer) obj;
+ }
+ }
+
+ private static Object getObject( Map<String, Object> context, String key, Object defaultValue )
+ {
+ Object value = context.get( key );
+
+ if ( value == null )
+ {
+ return defaultValue;
+ }
+
+ return value;
+ }
+}
+
Propchange: continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java Thu Nov 26 03:12:11 2009
@@ -30,6 +30,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.continuum.distributed.commons.utils.ContinuumDistributedUtil;
+
/**
* MasterBuildAgentTransportClient
*/
@@ -71,16 +73,17 @@
throws Exception
{
Boolean result;
+ String projectInfo = ContinuumDistributedUtil.getProjectNameAndId( buildResult );
try
{
result = master.returnBuildResult( buildResult );
- log.info( "Returning the build result." );
+ log.info( "Returning the build result for project " + projectInfo + "." );
}
catch ( Exception e )
{
- log.error( "Failed to return the build result.", e );
- throw new Exception( "Failed to return the build result", e );
+ log.error( "Failed to return the build result for project " + projectInfo + ".", e );
+ throw new Exception( "Failed to return the build result for project " + projectInfo + ".", e );
}
return result;
@@ -109,16 +112,17 @@
throws Exception
{
Boolean result;
+ String projectInfo = ContinuumDistributedUtil.getProjectNameAndId( prepareBuildResult );
try
{
result = master.prepareBuildFinished( prepareBuildResult );
- log.info( "Prepare build finished." );
+ log.info( "Prepare build finished for project " + projectInfo + "." );
}
catch ( Exception e )
{
- log.error( "Failed to finish prepare build" );
- throw new Exception( "Failed to finish prepare build", e );
+ log.error( "Failed to finish prepare build for project " + projectInfo + "." );
+ throw new Exception( "Failed to finish prepare build for project " + projectInfo + ".", e );
}
return result;
@@ -132,12 +136,12 @@
try
{
result = master.startProjectBuild( projectId );
- log.info( "Return project currently building" );
+ log.info( "Return project currently building, projectId=" + projectId );
}
catch ( Exception e )
{
- log.error( "Failed to return project currently building", e );
- throw new Exception( "Failed to return project currently building", e );
+ log.error( "Failed to return project currently building, projectId=" + projectId, e );
+ throw new Exception( "Failed to return project currently building, projectId=" + projectId, e );
}
return result;
@@ -147,16 +151,17 @@
throws Exception
{
Boolean result;
+ String projectInfo = ContinuumDistributedUtil.getProjectNameAndId( prepareBuildResult );
try
{
result = master.startPrepareBuild( prepareBuildResult );
- log.info( "Started prepare build" );
+ log.info( "Start prepare build for project " + projectInfo );
}
catch ( Exception e )
{
- log.error( "Failed to start prepare build", e );
- throw new Exception( "Failed to start prepare build", e );
+ log.error( "Failed to start prepare build for project " + projectInfo, e );
+ throw new Exception( "Failed to start prepare build for project " + projectInfo, e );
}
return result;
@@ -169,12 +174,14 @@
try
{
result = master.getEnvironments( buildDefinitionId, installationType );
- log.info( "Retrieved environments" );
+ log.info( "Retrieved environments. buildDefinitionId=" + buildDefinitionId + ", installationType=" + installationType );
}
catch ( Exception e )
{
- log.error( "Failed to retrieve environments", e );
- throw new Exception( "Failed to retrieve environments", e );
+ log.error( "Failed to retrieve environments. buildDefinitionId=" + buildDefinitionId +
+ ", installationType=" + installationType, e );
+ throw new Exception( "Failed to retrieve environments. buildDefinitionId=" +
+ buildDefinitionId + ", installationType=" + installationType, e );
}
return result;
@@ -184,16 +191,17 @@
throws Exception
{
Boolean result;
+ String projectInfo = ContinuumDistributedUtil.getProjectNameAndId( project );
try
{
result = master.updateProject( project );
- log.info( "Updating project" );
+ log.info( "Updating project " + projectInfo );
}
catch ( Exception e )
{
- log.error( "Failed to update project", e );
- throw new Exception( "Failed to update project", e );
+ log.error( "Failed to update project " + projectInfo, e );
+ throw new Exception( "Failed to update project " + projectInfo, e );
}
return result;
@@ -203,16 +211,17 @@
throws Exception
{
Boolean result;
+ String projectInfo = ContinuumDistributedUtil.getProjectNameAndId( context );
try
{
result = master.shouldBuild( context );
- log.info( "Checking if project should build" );
+ log.info( "Checking if project " + projectInfo + " should build" );
}
catch ( Exception e )
{
- log.error( "Failed to determine if project should build", e );
- throw new Exception( "Failed to determine if project should build", e );
+ log.error( "Failed to determine if project " + projectInfo + " should build", e );
+ throw new Exception( "Failed to determine if project " + projectInfo + " should build", e );
}
return result;
Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java Thu Nov 26 03:12:11 2009
@@ -22,6 +22,7 @@
import java.util.Map;
import org.apache.continuum.builder.distributed.DistributedBuildService;
+import org.apache.continuum.distributed.commons.utils.ContinuumDistributedUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +44,7 @@
public Boolean returnBuildResult( Map<String, Object> buildResult )
throws Exception
{
- log.info( "Build result returned." );
+ log.info( "Build result returned for project " + ContinuumDistributedUtil.getProjectNameAndId( buildResult ) + "." );
distributedBuildService.updateBuildResult( buildResult );
return Boolean.TRUE;
}
@@ -59,7 +60,7 @@
public Boolean prepareBuildFinished( Map<String, Object> prepareBuildResult )
throws Exception
{
- log.info( "Prepare build finished." );
+ log.info( "Prepare build finished for project " + ContinuumDistributedUtil.getProjectNameAndId( prepareBuildResult ) + "." );
distributedBuildService.prepareBuildFinished( prepareBuildResult );
return Boolean.TRUE;
}
@@ -67,7 +68,7 @@
public Boolean startProjectBuild( Integer projectId )
throws Exception
{
- log.info( "Start project build." );
+ log.info( "Start project '" + projectId + "' build." );
distributedBuildService.startProjectBuild( projectId );
return Boolean.TRUE;
}
@@ -75,7 +76,7 @@
public Boolean startPrepareBuild( Map<String, Object> prepareBuildResult )
throws Exception
{
- log.info( "Start prepare build." );
+ log.info( "Start prepare build of project " + ContinuumDistributedUtil.getProjectNameAndId( prepareBuildResult ) + "." );
distributedBuildService.startPrepareBuild( prepareBuildResult );
return Boolean.TRUE;
}
@@ -83,14 +84,14 @@
public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType )
throws Exception
{
- log.info( "Retrieving environments" );
+ log.info( "Retrieving environments. buildDefinitionId=" + buildDefinitionId + ", installationType=" + installationType );
return distributedBuildService.getEnvironments( buildDefinitionId, installationType );
}
public Boolean updateProject( Map<String, Object> project )
throws Exception
{
- log.info( "Start updating project" );
+ log.info( "Start updating project " + ContinuumDistributedUtil.getProjectNameAndId( project ) );
distributedBuildService.updateProject( project );
return Boolean.TRUE;
}
@@ -98,7 +99,7 @@
public Boolean shouldBuild( Map<String, Object> context )
throws Exception
{
- log.info( "Checking if project should build" );
+ log.info( "Checking if project " + ContinuumDistributedUtil.getProjectNameAndId( context ) + " should build" );
return distributedBuildService.shouldBuild( context );
}
}
Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/pom.xml?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/pom.xml Thu Nov 26 03:12:11 2009
@@ -32,4 +32,12 @@
<module>continuum-distributed-master-server</module>
<module>continuum-distributed-master-client</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-distributed-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java Thu Nov 26 03:12:11 2009
@@ -114,12 +114,12 @@
try
{
buildResult = slave.getBuildResult( projectId );
- log.info( "Build result for project " + projectId + " acquired." );
+ log.info( "Build result for project '" + projectId + "' acquired." );
}
catch ( Exception e )
{
- log.error( "Failed to get build result for project " + projectId, e );
- throw new Exception( "Failed to get build result for project " + projectId, e );
+ log.error( "Failed to get build result for project '" + projectId + "'", e );
+ throw new Exception( "Failed to get build result for project '" + projectId + "'", e );
}
return buildResult;
@@ -190,12 +190,12 @@
try
{
result = slave.generateWorkingCopyContent( projectId, directory, baseUrl, imagesBaseUrl );
- log.info( "Generated working copy content" );
+ log.info( "Generated working copy content for project '" + projectId + "'" );
}
catch ( Exception e )
{
- log.error( "Error generating working copy content", e );
- throw new Exception( "Error generating working copy content", e );
+ log.error( "Error generating working copy content for project '" + projectId + "'", e );
+ throw new Exception( "Error generating working copy content for project '" + projectId + "'", e );
}
return result;
@@ -209,12 +209,12 @@
try
{
result = slave.getProjectFileContent( projectId, directory, filename );
- log.info( "Retrived project file content" );
+ log.info( "Retrieved project '" + projectId + "' file content" );
}
catch ( Exception e )
{
- log.error( "Error retrieving project file content", e );
- throw new Exception( "Error retrieving project file content", e );
+ log.error( "Error retrieving project '" + projectId + "' file content", e );
+ throw new Exception( "Error retrieving project '" + projectId + "' file content", e );
}
return result;
@@ -228,12 +228,12 @@
try
{
result = slave.getReleasePluginParameters( projectId, pomFilename );
- log.info( "Retrieving release plugin parameters" );
+ log.info( "Retrieving release plugin parameters for project '" + projectId + "'" );
}
catch ( Exception e )
{
- log.error( "Error retrieving release plugin parameters", e );
- throw new Exception( "Error retrieving release plugin parameters", e );
+ log.error( "Error retrieving release plugin parameters for project '" + projectId + "'", e );
+ throw new Exception( "Error retrieving release plugin parameters for project '" + projectId + "'", e );
}
return result;
@@ -247,12 +247,12 @@
try
{
result = slave.processProject( projectId, pomFilename, autoVersionSubmodules );
- log.info( "Processing project" );
+ log.info( "Processing project '" + projectId + "'" );
}
catch ( Exception e )
{
- log.error( "Error processing project", e );
- throw new Exception( "Error processing project", e );
+ log.error( "Error processing project '" + projectId + "'", e );
+ throw new Exception( "Error processing project '" + projectId + "'", e );
}
return result;
@@ -267,7 +267,7 @@
try
{
releaseId = slave.releasePrepare( project, properties, releaseVersion, developmentVersion, environments, username );
- log.info( "Preparing release" );
+ log.info( "Preparing release '" + releaseId + "'" );
}
catch ( Exception e )
{
@@ -286,12 +286,12 @@
try
{
result = slave.getReleaseResult( releaseId );
- log.info( "Retrieving release result for " + releaseId );
+ log.info( "Retrieving release result, releaseId=" + releaseId );
}
catch ( Exception e )
{
- log.error( "Error retrieving release result for " + releaseId, e );
- throw new Exception( "Error retrieving release result for " + releaseId, e );
+ log.error( "Error retrieving release result, releaseId=" + releaseId, e );
+ throw new Exception( "Error retrieving release result, releaseId=" + releaseId, e );
}
return result;
@@ -305,12 +305,12 @@
try
{
result = slave.getListener( releaseId );
- log.info( "Retrieving listener for " + releaseId );
+ log.info( "Retrieving listener for releaseId=" + releaseId );
}
catch ( Exception e )
{
- log.error( "Error retrieving listener for " + releaseId, e );
- throw new Exception( "Error retrieving listener for " + releaseId, e );
+ log.error( "Error retrieving listener for releaseId=" + releaseId, e );
+ throw new Exception( "Error retrieving listener for releaseId=" + releaseId, e );
}
return result;
@@ -325,12 +325,12 @@
{
slave.removeListener( releaseId );
result = Boolean.FALSE;
- log.info( "Removing listener for " + releaseId );
+ log.info( "Removing listener for releaseId=" + releaseId );
}
catch ( Exception e )
{
- log.error( "Error removing listener for " + releaseId, e );
- throw new Exception( "Error removing listener for " + releaseId, e );
+ log.error( "Error removing listener for releaseId=" + releaseId, e );
+ throw new Exception( "Error removing listener for releaseId=" + releaseId, e );
}
return result;
@@ -344,12 +344,12 @@
try
{
result = slave.getPreparedReleaseName( releaseId );
- log.info( "Retrieving prepared release name for " + releaseId );
+ log.info( "Retrieving prepared release name, releaseId=" + releaseId );
}
catch ( Exception e )
{
- log.error( "Error while retrieving prepared release name for " + releaseId );
- throw new Exception( "Error while retrieving prepared release name for " + releaseId );
+ log.error( "Error while retrieving prepared release name, releaseId=" + releaseId );
+ throw new Exception( "Error while retrieving prepared release name, releaseId=" + releaseId );
}
return result;
@@ -365,12 +365,12 @@
{
slave.releasePerform( releaseId, goals, arguments, useReleaseProfile, repository, username );
result = Boolean.FALSE;
- log.info( "Performing release" );
+ log.info( "Performing release of releaseId=" + releaseId );
}
catch ( Exception e )
{
- log.error( "Error performing release", e );
- throw new Exception( "Error performing release", e );
+ log.error( "Error performing release of releaseId=" + releaseId, e );
+ throw new Exception( "Error performing release of releaseId=" + releaseId, e );
}
return result;
@@ -387,12 +387,12 @@
{
result = slave.releasePerformFromScm( goals, arguments, useReleaseProfile, repository, scmUrl, scmUsername,
scmPassword, scmTag, scmTagBase, environments, username );
- log.info( "Performing release" );
+ log.info( "Performing release of scmUrl=" + scmUrl );
}
catch ( Exception e )
{
- log.error( "Error performing release from scm", e );
- throw new Exception( "Error performing release from scm", e );
+ log.error( "Error performing release from scm '" + scmUrl + "'", e );
+ throw new Exception( "Error performing release from scm '" + scmUrl + "'", e );
}
return result;
@@ -406,12 +406,12 @@
try
{
result = slave.releaseCleanup( releaseId );
- log.info( "Cleanup release of " + releaseId );
+ log.info( "Cleanup release, releaseId=" + releaseId );
}
catch ( Exception e )
{
- log.error( "Error cleaning up release of " + releaseId, e );
- throw new Exception( "Error cleaning up release of " + releaseId, e );
+ log.error( "Error cleaning up release, releaseId=" + releaseId, e );
+ throw new Exception( "Error cleaning up release, releaseId=" + releaseId, e );
}
return result;
@@ -426,12 +426,12 @@
{
slave.releaseRollback( releaseId, projectId );
result = Boolean.TRUE;
- log.info( "Rollback release " + releaseId );
+ log.info( "Rollback release. releaseId=" + releaseId + ", projectId=" + projectId );
}
catch ( Exception e )
{
- log.error( "Failed to rollback release " + releaseId );
- throw new Exception( "Failed to rollback release " + releaseId );
+ log.error( "Failed to rollback release. releaseId=" + releaseId + ", projectId=" + projectId );
+ throw new Exception( "Failed to rollback release. releaseId=" + releaseId + ", projectId=" + projectId );
}
return result;
@@ -521,12 +521,12 @@
try
{
result = slave.isProjectGroupInQueue( projectGroupId );
- log.info( "Checking if project group is in queue" );
+ log.info( "Checking if project group '" + projectGroupId + "' is in queue" );
}
catch ( Exception e )
{
- log.error( "Failed to check if project group is in queue", e );
- throw new Exception( "Failed to check if project group is in queue", e );
+ log.error( "Failed to check if project group '" + projectGroupId + "' is in queue", e );
+ throw new Exception( "Failed to check if project group '" + projectGroupId + "' is in queue", e );
}
return result;
@@ -578,15 +578,15 @@
try
{
result = slave.removeFromPrepareBuildQueue( projectGroupId, scmRootId );
- log.info( "Removing projectGroupId=" + projectGroupId + " scmRootId=" + scmRootId +
- " from prepare build queue of agent" );
+ log.debug( "Remove projects from prepare build queue. projectGroupId=" + projectGroupId +
+ ", scmRootId=" + scmRootId );
}
catch ( Exception e )
{
- log.error( "Failed to remove projectGroupId=" + projectGroupId + " scmRootId=" + scmRootId +
- " from prepare build queue of agent", e );
- throw new Exception( "Failed to remove projectGroupId=" + projectGroupId + " scmRootId=" + scmRootId +
- " from prepare build queue of agent", e );
+ log.error( "Failed to remove projects from prepare build queue. projectGroupId=" + projectGroupId +
+ ", scmRootId=" + scmRootId );
+ throw new Exception( "Failed to remove from prepare build queue. projectGroupId=" + projectGroupId +
+ " scmRootId=" + scmRootId, e );
}
return result;
@@ -619,12 +619,12 @@
try
{
result = slave.removeFromBuildQueue( projectId, buildDefinitionId );
- log.info( "Removing project " + projectId + " from build queue of agent" );
+ log.info( "Removing project '" + projectId + "' from build queue of agent" );
}
catch ( Exception e )
{
- log.error( "Failed to remove project " + projectId + " from build queue of agent", e );
- throw new Exception( "Failed to remove project " + projectId + " from build queue of agent", e );
+ log.error( "Failed to remove project '" + projectId + "' from build queue of agent", e );
+ throw new Exception( "Failed to remove project '" + projectId + "' from build queue of agent", e );
}
return result;
Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java Thu Nov 26 03:12:11 2009
@@ -90,11 +90,11 @@
try
{
buildResult = continuumBuildAgentService.getBuildResult( projectId );
- log.info( "Build result for project " + projectId + " acquired." );
+ log.info( "Build result for project '" + projectId + "' acquired." );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to get build result for project " + projectId, e );
+ log.error( "Failed to get build result for project '" + projectId + "'", e );
throw e;
}
@@ -106,7 +106,7 @@
{
Map<String, Object> project = continuumBuildAgentService.getProjectCurrentlyBuilding();
- log.info( "Retrieving currently building project");
+ log.info( "Retrieving currently building project" );
return project;
}
@@ -144,12 +144,12 @@
{
try
{
- return continuumBuildAgentService.generateWorkingCopyContent( projectId, directory, baseUrl,
- imagesBaseUrl );
+ log.info( "Generate working copy content for project '" + projectId + "'" );
+ return continuumBuildAgentService.generateWorkingCopyContent( projectId, directory, baseUrl, imagesBaseUrl );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to generate working copy content", e );
+ log.error( "Failed to generate working copy content for projectId=" + projectId, e );
throw e;
}
}
@@ -159,11 +159,12 @@
{
try
{
+ log.info( "Retrieve project '" + projectId + "' file content" );
return continuumBuildAgentService.getProjectFileContent( projectId, directory, filename );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to retrieve project file content", e );
+ log.error( "Failed to retrieve project '" + projectId + "' file content", e );
throw e;
}
}
@@ -173,11 +174,12 @@
{
try
{
+ log.info( "Retrieving release plugin parameters for project '" + projectId + "'" );
return continuumBuildAgentService.getReleasePluginParameters( projectId, pomFilename );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to retrieve release plugin parameters", e );
+ log.error( "Failed to retrieve release plugin parameters for project '" + projectId + "'", e );
throw e;
}
}
@@ -187,11 +189,12 @@
{
try
{
+ log.info( "Processing project '" + projectId + "'" );
return continuumBuildAgentService.processProject( projectId, pomFilename, autoVersionSubmodules );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to process project", e );
+ log.error( "Failed to process project '" + projectId + "'", e );
throw e;
}
}
@@ -202,6 +205,7 @@
{
try
{
+ log.info( "Preparing release" );
return continuumBuildAgentService.releasePrepare( project, properties, releaseVersion, developmentVersion,
environments, username );
}
@@ -217,11 +221,12 @@
{
try
{
+ log.info( "Retrieving listener for releaseId=" + releaseId );
return continuumBuildAgentService.getListener( releaseId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to retrieve listener state of " + releaseId, e );
+ log.error( "Failed to retrieve listener state of releaseId=" + releaseId, e );
throw e;
}
}
@@ -231,11 +236,12 @@
{
try
{
+ log.info( "Retrieving release result, releaseId=" + releaseId );
return continuumBuildAgentService.getReleaseResult( releaseId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to retrieve release result of " + releaseId, e );
+ log.error( "Failed to retrieve release result of releaseId=" + releaseId, e );
throw e;
}
}
@@ -249,10 +255,11 @@
{
continuumBuildAgentService.removeListener( releaseId );
result = Boolean.TRUE;
+ log.info( "Removing listener for releaseId=" + releaseId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to remove listener of " + releaseId, e );
+ log.error( "Failed to remove listener of releaseId=" + releaseId, e );
throw e;
}
@@ -264,11 +271,12 @@
{
try
{
+ log.info( "Retrieving prepared release name, releaseId=" + releaseId );
return continuumBuildAgentService.getPreparedReleaseName( releaseId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to retrieve prepared release name of " + releaseId );
+ log.error( "Failed to retrieve prepared release name of releaseId=" + releaseId );
throw e;
}
}
@@ -283,10 +291,11 @@
{
continuumBuildAgentService.releasePerform( releaseId, goals, arguments, useReleaseProfile, repository, username );
result = Boolean.TRUE;
+ log.info( "Perform release of releaseId=" + releaseId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Unable to perform release", e );
+ log.error( "Unable to perform release of releaseId=" + releaseId, e );
throw e;
}
@@ -300,13 +309,14 @@
{
try
{
+ log.info( "Perform release of scmUrl=" + scmUrl );
return continuumBuildAgentService.releasePerformFromScm( goals, arguments, useReleaseProfile, repository,
scmUrl, scmUsername, scmPassword, scmTag,
scmTagBase, environments, username );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Unable to perform release", e );
+ log.error( "Unable to perform release of scmUrl=" + scmUrl, e );
throw e;
}
}
@@ -316,11 +326,12 @@
{
try
{
+ log.info( "Cleanup release, releaseId=" + releaseId );
return continuumBuildAgentService.releaseCleanup( releaseId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Unable to cleanup release of " + releaseId, e );
+ log.error( "Unable to cleanup release, releaseId=" + releaseId, e );
throw e;
}
}
@@ -334,10 +345,11 @@
{
continuumBuildAgentService.releaseRollback( releaseId, projectId );
result = Boolean.TRUE;
+ log.info( "Rollback release. releaseId=" + releaseId + ", projectId=" + projectId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to rollback release " + releaseId, e );
+ log.error( "Failed to rollback release. releaseId=" + releaseId + ", projectId=" + projectId, e );
throw e;
}
@@ -377,6 +389,7 @@
{
try
{
+ log.info( "Retrieving projects in build queue" );
return continuumBuildAgentService.getProjectsInBuildQueue();
}
catch ( ContinuumBuildAgentException e )
@@ -391,6 +404,7 @@
{
try
{
+ log.info( "Retrieving projects in prepare build queue" );
return continuumBuildAgentService.getProjectsInPrepareBuildQueue();
}
catch ( ContinuumBuildAgentException e )
@@ -403,18 +417,21 @@
public Boolean isProjectGroupInQueue( int projectGroupId )
throws Exception
{
+ log.info( "Checking if project group '" + projectGroupId + "' is in queue" );
return continuumBuildAgentService.isProjectGroupInQueue( projectGroupId );
}
public Boolean isProjectCurrentlyBuilding( int projectId )
throws Exception
{
+ log.info( "Checking if project " + projectId + " is currently building in agent" );
return continuumBuildAgentService.isProjectCurrentlyBuilding( projectId );
}
public Boolean isProjectInBuildQueue( int projectId )
throws Exception
{
+ log.info( "Checking if project " + projectId + "is in build queue of agent" );
return continuumBuildAgentService.isProjectInBuildQueue( projectId );
}
@@ -423,12 +440,15 @@
{
try
{
+ log.info( "Remove projects from prepare build queue. projectGroupId=" + projectGroupId +
+ ", scmRootId=" + scmRootId );
return continuumBuildAgentService.removeFromPrepareBuildQueue( projectGroupId, scmRootId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to remove projects from prepare build queue" );
- throw e;
+ log.error( "Failed to remove projects from prepare build queue. projectGroupId=" + projectGroupId +
+ ", scmRootId=" + scmRootId );
+ throw e;
}
}
@@ -441,6 +461,7 @@
{
continuumBuildAgentService.removeFromPrepareBuildQueue( hashCodes );
result = Boolean.TRUE;
+ log.info( "Remove projects from prepare build queue" );
}
catch ( ContinuumBuildAgentException e )
{
@@ -456,11 +477,12 @@
{
try
{
+ log.debug( "Remove project '" + projectId + "' from build queue" );
return continuumBuildAgentService.removeFromBuildQueue( projectId, buildDefinitionId );
}
catch ( ContinuumBuildAgentException e )
{
- log.error( "Failed to remove project from build queue" );
+ log.error( "Failed to remove project '" + projectId + "' from build queue" );
throw e;
}
}
@@ -474,6 +496,7 @@
{
continuumBuildAgentService.removeFromBuildQueue( hashCodes );
result = Boolean.TRUE;
+ log.info( "Remove projects from build queue" );
}
catch ( ContinuumBuildAgentException e )
{
Modified: continuum/trunk/continuum-distributed/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/pom.xml?rev=884391&r1=884390&r2=884391&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/pom.xml (original)
+++ continuum/trunk/continuum-distributed/pom.xml Thu Nov 26 03:12:11 2009
@@ -30,6 +30,7 @@
<modules>
<module>continuum-distributed-master</module>
<module>continuum-distributed-slave</module>
+ <module>continuum-distributed-commons</module>
<!-- <module>continuum-distributed-tests</module> -->
</modules>
</project>