Merge pull request jenkinsci#120 from jglick/GitHubPushTrigger-logging

lanwen · lanwen · commit e8af197800c3 · 2016-04-28T18:24:09.000+03:00
Improved logging format
diff --git a/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java b/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java
@@ -108,7 +108,6 @@ private boolean runPolling() {
 
             public void run() {
                 if (runPolling()) {
-                    String name = " #" + job.getNextBuildNumber();
                     GitHubPushCause cause;
                     try {
                         cause = new GitHubPushCause(getLogFile(), pushBy);
@@ -117,9 +116,10 @@ public void run() {
                         cause = new GitHubPushCause(pushBy);
                     }
                     if (asParameterizedJobMixIn(job).scheduleBuild(cause)) {
-                        LOGGER.info("SCM changes detected in " + job.getName() + ". Triggering " + name);
+                        LOGGER.info("SCM changes detected in " + job.getFullName()
+                                  + ". Triggering #" + job.getNextBuildNumber());
                     } else {
-                        LOGGER.info("SCM changes detected in " + job.getName() + ". Job is already in the queue");
+                        LOGGER.info("SCM changes detected in " + job.getFullName() + ". Job is already in the queue");
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,6 @@ private boolean runPolling() {`
`108`	`108`
`109`	`109`	`public void run() {`
`110`	`110`	`if (runPolling()) {`
`111`		`- String name = " #" + job.getNextBuildNumber();`
`112`	`111`	`GitHubPushCause cause;`
`113`	`112`	`try {`
`114`	`113`	`cause = new GitHubPushCause(getLogFile(), pushBy);`
`@@ -117,9 +116,10 @@ public void run() {`
`117`	`116`	`cause = new GitHubPushCause(pushBy);`
`118`	`117`	`}`
`119`	`118`	`if (asParameterizedJobMixIn(job).scheduleBuild(cause)) {`
`120`		`- LOGGER.info("SCM changes detected in " + job.getName() + ". Triggering " + name);`
	`119`	`+ LOGGER.info("SCM changes detected in " + job.getFullName()`
	`120`	`+ + ". Triggering #" + job.getNextBuildNumber());`
`121`	`121`	`} else {`
`122`		`- LOGGER.info("SCM changes detected in " + job.getName() + ". Job is already in the queue");`
	`122`	`+ LOGGER.info("SCM changes detected in " + job.getFullName() + ". Job is already in the queue");`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`}`