Skip to content

Commit

Permalink
Merge pull request #80 from tzachs/JENKINS-67250
Browse files Browse the repository at this point in the history 
JENKINS-67250 - Changed INFO log messages to FINER
  • Loading branch information
@tzachs
tzachs authored Nov 27, 2021
2 parents 04071bb + 3279197 commit 2fd4234
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ public void triggerMatchingJobs(String user, String url, String scm, String payl
LOGGER.log(Level.FINE, "Considering to poke {0}", job.getFullDisplayName());
SCMTriggerItem item = SCMTriggerItem.SCMTriggerItems.asSCMTriggerItem(job);
if (item == null) {
LOGGER.log(Level.INFO, "item is null");
LOGGER.log(Level.FINER, "item is null");
} else {
List<SCM> scmTriggered = new ArrayList<>();
if (item.getSCMs().isEmpty()) {
LOGGER.log(Level.WARNING, "No SCM configuration was found!");
}
for (SCM scmTrigger : item.getSCMs()) {
if (match(scmTrigger, remote, bTrigger.getOverrideUrl()) && !hasBeenTriggered(scmTriggered, scmTrigger)) {
LOGGER.log(Level.INFO, "Triggering BitBucket job {0}", job.getFullDisplayName());
LOGGER.log(Level.FINER, "Triggering BitBucket job {0}", job.getFullDisplayName());
scmTriggered.add(scmTrigger);
bTrigger.onPost(user, payload, branchName);
} else {
Expand All @@ -92,7 +92,7 @@ public void triggerMatchingJobs(String user, String url, String scm, String payl
for (SCMSource scmSource : scmSources) {
LOGGER.log(Level.FINER, "Considering candidate scmSource {0}", scmSource);
if (match(scmSource, remote)) {
LOGGER.log(Level.INFO, "Triggering BitBucket scmSourceOwner [{0}]", scmSourceOwner);
LOGGER.log(Level.FINER, "Triggering BitBucket scmSourceOwner [{0}]", scmSourceOwner);
scmSourceOwner.onSCMSourceUpdated(scmSource);
} else if (scmSourceOwner instanceof WorkflowMultiBranchProject) {
LOGGER.finest("scmSourceOwner [" + scmSourceOwner.getName() + "] is of type WorkflowMultiBranchProject");
Expand Down
30 changes: 15 additions & 15 deletions src/main/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,34 +27,34 @@ public BitbucketPayloadProcessor() {
public void processPayload(JSONObject payload, HttpServletRequest request) {
if ("Bitbucket-Webhooks/2.0".equals(request.getHeader("user-agent"))) {
if ("repo:push".equals(request.getHeader("x-event-key"))) {
LOGGER.log(Level.INFO, "Processing new Webhooks payload");
LOGGER.log(Level.FINER, "Processing new Webhooks payload");
processWebhookPayload(payload);
}
} else if (payload.has("actor") && payload.has("repository") && payload.getJSONObject("repository").has("links")) {
if ("repo:push".equals(request.getHeader("x-event-key"))) {
// found web hook according to https://support.atlassian.com/bitbucket-cloud/docs/event-payloads/
LOGGER.log(Level.INFO, "Processing new Cloud Webhooks payload");
LOGGER.log(Level.FINER, "Processing new Cloud Webhooks payload");
processWebhookPayloadBitBucketServer(payload);
} else if ("repo:refs_changed".equals(request.getHeader("x-event-key"))) {
// found web hook according to https://confluence.atlassian.com/bitbucketserver/event-payload-938025882.html
LOGGER.log(Level.INFO, "Processing new Self Hosted Server Webhooks payload");
LOGGER.log(Level.FINER, "Processing new Self Hosted Server Webhooks payload");
processWebhookPayloadBitBucketSelfHosted(payload);
} else {
LOGGER.log(Level.INFO, "Unsupported [x-event-key] value, [x-event-key] is [" + request.getHeader("x-event-key") + "]");
LOGGER.log(Level.FINER, "Unsupported [x-event-key] value, [x-event-key] is [" + request.getHeader("x-event-key") + "]");
}
} else if (payload.has("actor")) {
// we assume that the passed hook was from bitbucket server https://confluence.atlassian.com/bitbucketserver/managing-webhooks-in-bitbucket-server-938025878.html
LOGGER.log(Level.INFO, "Processing webhook for self-hosted bitbucket instance");
LOGGER.log(Level.FINER, "Processing webhook for self-hosted bitbucket instance");
processWebhookPayloadBitBucketSelfHosted(payload);
} else {
// https://github.com/jenkinsci/bitbucket-plugin/pull/65
if ("diagnostics:ping".equals(request.getHeader("x-event-key"))) {
if (payload.has("test") && payload.getBoolean("test")) {
LOGGER.log(Level.INFO, "Bitbucket test connection payload");
LOGGER.log(Level.FINER, "Bitbucket test connection payload");
return;
}
}
LOGGER.log(Level.INFO, "Processing old POST service payload");
LOGGER.log(Level.FINER, "Processing old POST service payload");
processPostServicePayload(payload);
}
}
Expand Down Expand Up @@ -94,7 +94,7 @@ private void processWebhookPayload(JSONObject payload) {
if (isPayloadOldMemberNull(payload)){
String branchName = getBranchName(payload);
JSONObject repo = payload.getJSONObject("repository");
LOGGER.log(Level.INFO, "Branch [" +branchName + "] was created");
LOGGER.log(Level.FINER, "Branch [" +branchName + "] was created");
String user = getUser(payload, "actor");
String url = repo.getJSONObject("links").getJSONObject("html").getString("href");
String scm = repo.has("scm") ? repo.getString("scm") : "git";
Expand All @@ -103,15 +103,15 @@ private void processWebhookPayload(JSONObject payload) {
} else {
if (payload.has("repository")) {
JSONObject repo = payload.getJSONObject("repository");
LOGGER.log(Level.INFO, "Received commit hook notification for {0}", repo);
LOGGER.log(Level.FINER, "Received commit hook notification for {0}", repo);

String user = getUser(payload, "actor");
String url = repo.getJSONObject("links").getJSONObject("html").getString("href");
String scm = repo.has("scm") ? repo.getString("scm") : "git";

probe.triggerMatchingJobs(user, url, scm, payload.toString());
} else if (payload.has("scm")) {
LOGGER.log(Level.INFO, "Received commit hook notification for hg: {0}", payload);
LOGGER.log(Level.FINER, "Received commit hook notification for hg: {0}", payload);
String user = getUser(payload, "owner");
String url = payload.getJSONObject("links").getJSONObject("html").getString("href");
String scm = payload.has("scm") ? payload.getString("scm") : "hg";
Expand All @@ -124,10 +124,10 @@ private void processWebhookPayload(JSONObject payload) {

private String getBranchName(JSONObject payload) {
if (payload.has("push")) {
LOGGER.log(Level.INFO, "found [push] in payload");
LOGGER.log(Level.FINER, "found [push] in payload");
JSONObject jsonObjectPush = payload.getJSONObject("push");
if (jsonObjectPush.has("changes")) {
LOGGER.log(Level.INFO, "found [push/changes] in payload");
LOGGER.log(Level.FINER, "found [push/changes] in payload");
JSONArray jsonArrayChanges = jsonObjectPush.getJSONArray("changes");

for (Object jsonArrayChange : jsonArrayChanges) {
Expand All @@ -147,10 +147,10 @@ private String getBranchName(JSONObject payload) {

private boolean isPayloadOldMemberNull(JSONObject payload) {
if ( payload.has("push")){
LOGGER.log(Level.INFO, "found [push] in payload");
LOGGER.log(Level.FINER, "found [push] in payload");
JSONObject jsonObjectPush = payload.getJSONObject("push");
if (jsonObjectPush.has("changes")){
LOGGER.log(Level.INFO, "found [push/changes] in payload");
LOGGER.log(Level.FINER, "found [push/changes] in payload");
JSONArray jsonArrayChanges = jsonObjectPush.getJSONArray("changes");

for (Object jsonArrayChange : jsonArrayChanges) {
Expand Down Expand Up @@ -201,7 +201,7 @@ private void processWebhookPayloadBitBucketServer(JSONObject payload) {

private void processPostServicePayload(JSONObject payload) {
JSONObject repo = payload.getJSONObject("repository");
LOGGER.log(Level.INFO, "Received commit hook notification for {0}", repo);
LOGGER.log(Level.FINER, "Received commit hook notification for {0}", repo);

String user = payload.getString("user");
String url = payload.getString("canon_url") + repo.getString("absolute_url");
Expand Down

0 comments on commit 2fd4234

Please sign in to comment.