continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1156491 - in /continuum/trunk: continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/ continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distrib...
Date Thu, 11 Aug 2011 05:35:30 GMT
Author: ctan
Date: Thu Aug 11 05:35:29 2011
New Revision: 1156491

URL: http://svn.apache.org/viewvc?rev=1156491&view=rev
Log:
[CONTINUUM-2638] improve logs

Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
    continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java?rev=1156491&r1=1156490&r2=1156491&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
Thu Aug 11 05:35:29 2011
@@ -331,56 +331,48 @@ public class DefaultDistributedBuildMana
 
     	if ( buildTrigger.getTrigger() == ContinuumProjectState.TRIGGER_FORCED )
     	{
-    	    log.debug( "Build project triggered manually by {}", buildTrigger.getTriggeredBy()
);
+    	    log.debug( "Build project (projectGroupId={}) triggered manually by {}", projectGroupId,
buildTrigger.getTriggeredBy() );
     	}
     	else
     	{
-    	    log.debug( "Build project triggered by schedule {}", buildTrigger.getTriggeredBy()
);
+    	    log.debug( "Build project (projectGroupId={}) triggered by schedule {}", projectGroupId,
buildTrigger.getTriggeredBy() );
     	}
 
     	if ( log.isDebugEnabled() )
     	{
-    	    log.debug( "Projects currently building:" );
-
     	    Map<String, BuildProjectTask> buildTasks = getProjectsCurrentlyBuilding();
 
     	    for ( String key : buildTasks.keySet() )
     	    {
-    	        log.debug( "Build agent {} : Project {}", key, buildTasks.get( key ).getProjectName()
);
+    	        log.debug( "Current build of agent {} :: Project {}", key, buildTasks.get( key
).getProjectName() );
     	    }
 
-    	    log.debug( "Projects in build queue:" );
-
     	    Map<String, List<BuildProjectTask>> buildQueues = getProjectsInBuildQueue();
 
     	    for ( String key : buildQueues.keySet() )
     	    {
     	        for ( BuildProjectTask buildTask : buildQueues.get( key ) )
     	        {
-    	            log.debug( "Build agent {} : Project {}", key, buildTask.getProjectName()
);
+    	            log.debug( "Build Queue of agent {} :: Project {}", key, buildTask.getProjectName()
);
     	        }
     	    }
 
-    	    log.debug( "Projects currently preparing build:" );
-
     	    Map<String, PrepareBuildProjectsTask> prepareBuildTasks = getProjectsCurrentlyPreparingBuild();
 
     	    for( String key : prepareBuildTasks.keySet() )
     	    {
     	        PrepareBuildProjectsTask prepareBuildTask = prepareBuildTasks.get( key );
-    	        log.debug( "Build agent {} : Project Group {} - Scm Root {}", 
+    	        log.debug( "Current prepare build of agent {} :: Project Group {} - Scm Root
{}", 
     	                   new Object[] { key, prepareBuildTask.getProjectGroupName(), prepareBuildTask.getProjectScmRootId()
} );
     	    }
 
-    	    log.debug( "Projects in prepare build queue:" );
-
     	    Map<String, List<PrepareBuildProjectsTask>> prepareBuildQueues = getProjectsInPrepareBuildQueue();
 
     	    for ( String key : prepareBuildQueues.keySet() )
     	    {
     	        for ( PrepareBuildProjectsTask prepareBuildTask : prepareBuildQueues.get( key
) )
     	        {
-    	            log.debug( "Build agent {} : Project Group {} - Scm Root {}", 
+    	            log.debug( "Prepare Build Queue of agent {} : Project Group {} - Scm Root
{}", 
     	                       new Object[] { key, prepareBuildTask.getProjectGroupName(), prepareBuildTask.getProjectScmRootId()
} );
     	        }
     	    }
@@ -1611,7 +1603,7 @@ public class DefaultDistributedBuildMana
                     {
                         if ( isAgentAvailable( buildAgentUrl ) )
                         {
-                            log.debug( "Build agent is available: {}", buildAgentUrl );
+                            log.debug( "Build agent {} is available", buildAgentUrl );
 
                             SlaveBuildAgentTransportService client = createSlaveBuildAgentTransportClientConnection(
buildAgentUrl );
                             int agentBuildSize = client.getBuildSizeOfAgent();

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=1156491&r1=1156490&r2=1156491&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 Aug 11 05:35:29 2011
@@ -45,8 +45,8 @@ public class MasterBuildAgentTransportSe
         throws Exception
     {
         distributedBuildService.updateBuildResult( buildResult );
-        log.info( "Project build finished in build agent {}. Returned build result for project
{}", 
-                  buildAgentUrl, ContinuumDistributedUtil.getProjectNameAndId( buildResult
) );
+        log.info( "Project {} build finished in build agent {}. Returned build result.",

+                  ContinuumDistributedUtil.getProjectNameAndId( buildResult ), buildAgentUrl
);
         return Boolean.TRUE;
     }
 
@@ -71,7 +71,7 @@ public class MasterBuildAgentTransportSe
         throws Exception
     {
         distributedBuildService.startProjectBuild( projectId );
-        log.info( "Start building project '{}' in build agent {}.", projectId, buildAgentUrl
);
+        log.info( "Start building project (projectId={}) in build agent {}.", projectId,
buildAgentUrl );
         return Boolean.TRUE;
     }
 



Mime
View raw message