Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(logging): use logger.GetFactory over @slf4j #2894

Merged
merged 1 commit into from
May 3, 2019
Merged

fix(logging): use logger.GetFactory over @slf4j #2894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...spinnaker/orca/clouddriver/tasks/cluster/AbstractWaitForClusterWideClouddriverTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ import com.netflix.spinnaker.orca.clouddriver.utils.OortHelper
import com.netflix.spinnaker.orca.pipeline.model.Stage
import groovy.transform.Canonical
import groovy.transform.ToString
import groovy.util.logging.Slf4j
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Value

@Slf4j
abstract class AbstractWaitForClusterWideClouddriverTask extends AbstractCloudProviderAwareTask implements OverridableTimeoutRetryableTask {
private Logger log = LoggerFactory.getLogger(getClass())

@Override
public long getBackoffPeriod() { 10000 }

Expand Down Expand Up @@ -69,7 +71,7 @@ abstract class AbstractWaitForClusterWideClouddriverTask extends AbstractCloudPr
isMatch
})

log.info("${this.getClass().getSimpleName()}: Server groups matching $deployServerGroup : $matchingServerGroups")
log.info("Server groups matching $deployServerGroup : $matchingServerGroups")
isServerGroupOperationInProgress(stage, interestingHealthProviderNames, matchingServerGroups)
}

Expand Down Expand Up @@ -116,7 +118,7 @@ abstract class AbstractWaitForClusterWideClouddriverTask extends AbstractCloudPr
}

def serverGroups = cluster.get().serverGroups.collect { new TargetServerGroup(it) }
log.info "Pipeline ${stage.execution?.id}:${this.getClass().getSimpleName()} looking for server groups: $remainingDeployServerGroups found: $serverGroups"
log.info "Pipeline ${stage.execution?.id} looking for server groups: $remainingDeployServerGroups found: $serverGroups"

if (!serverGroups) {
return emptyClusterResult(stage, clusterSelection, cluster.get())
Expand All @@ -126,11 +128,11 @@ abstract class AbstractWaitForClusterWideClouddriverTask extends AbstractCloudPr
List<DeployServerGroup> stillRemaining = remainingDeployServerGroups.findAll(this.&isServerGroupOperationInProgress.curry(stage, serverGroups, healthProviderTypesToCheck))

if (stillRemaining) {
log.info "Pipeline ${stage.execution?.id}:${this.getClass().getSimpleName()} still has $stillRemaining"
log.info "Pipeline ${stage.execution?.id} still has $stillRemaining"
return TaskResult.builder(ExecutionStatus.RUNNING).context([remainingDeployServerGroups: stillRemaining]).build()
}

log.info "Pipeline ${stage.execution?.id}:${this.getClass().getSimpleName()} no server groups remain"
log.info "Pipeline ${stage.execution?.id} no server groups remain"
return TaskResult.SUCCEEDED
}
}