@@ -20,6 +20,10 @@ import (
2020 "context"
2121 "errors"
2222 "fmt"
23+ "net/url"
24+ "strconv"
25+ "time"
26+
2327 health2 "github.com/argoproj/gitops-engine/pkg/health"
2428 argoApplication "github.com/devtron-labs/devtron/client/argocdServer/bean"
2529 "github.com/devtron-labs/devtron/internal/sql/models"
@@ -40,12 +44,10 @@ import (
4044 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/read"
4145 bean4 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
4246 "github.com/devtron-labs/devtron/pkg/workflow/cd"
43- "net/url"
44- "strconv"
45- "time"
4647
4748 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
4849 "github.com/caarlos0/env"
50+ "github.com/devtron-labs/common-lib/async"
4951 k8sCommonBean "github.com/devtron-labs/common-lib/utils/k8s/commonBean"
5052 "github.com/devtron-labs/common-lib/utils/k8s/health"
5153 "github.com/devtron-labs/devtron/api/bean"
@@ -124,6 +126,7 @@ type AppServiceImpl struct {
124126 deploymentConfigService common2.DeploymentConfigService
125127 envConfigOverrideReadService read.EnvConfigOverrideService
126128 cdWorkflowRunnerService cd.CdWorkflowRunnerService
129+ asyncRunnable * async.Runnable
127130}
128131
129132type AppService interface {
@@ -151,7 +154,7 @@ func NewAppService(
151154 cdWorkflowRepository pipelineConfig.CdWorkflowRepository ,
152155 commonService commonService.CommonService ,
153156 chartTemplateService internalUtil.ChartTemplateService ,
154- cdPipelineStatusTimelineRepo pipelineConfig.PipelineStatusTimelineRepository ,
157+ pipelineStatusTimelineRepo pipelineConfig.PipelineStatusTimelineRepository ,
155158 pipelineStatusTimelineResourcesService status2.PipelineStatusTimelineResourcesService ,
156159 pipelineStatusSyncDetailService status2.PipelineStatusSyncDetailService ,
157160 pipelineStatusTimelineService status2.PipelineStatusTimelineService ,
@@ -164,7 +167,8 @@ func NewAppService(
164167 appListingService AppListingService ,
165168 deploymentConfigService common2.DeploymentConfigService ,
166169 envConfigOverrideReadService read.EnvConfigOverrideService ,
167- cdWorkflowRunnerService cd.CdWorkflowRunnerService ) * AppServiceImpl {
170+ cdWorkflowRunnerService cd.CdWorkflowRunnerService ,
171+ asyncRunnable * async.Runnable ) * AppServiceImpl {
168172 appServiceImpl := & AppServiceImpl {
169173 mergeUtil : mergeUtil ,
170174 pipelineOverrideRepository : pipelineOverrideRepository ,
@@ -178,7 +182,7 @@ func NewAppService(
178182 cdWorkflowRepository : cdWorkflowRepository ,
179183 commonService : commonService ,
180184 chartTemplateService : chartTemplateService ,
181- pipelineStatusTimelineRepository : cdPipelineStatusTimelineRepo ,
185+ pipelineStatusTimelineRepository : pipelineStatusTimelineRepo ,
182186 pipelineStatusTimelineResourcesService : pipelineStatusTimelineResourcesService ,
183187 pipelineStatusSyncDetailService : pipelineStatusSyncDetailService ,
184188 pipelineStatusTimelineService : pipelineStatusTimelineService ,
@@ -195,6 +199,7 @@ func NewAppService(
195199 deploymentConfigService : deploymentConfigService ,
196200 envConfigOverrideReadService : envConfigOverrideReadService ,
197201 cdWorkflowRunnerService : cdWorkflowRunnerService ,
202+ asyncRunnable : asyncRunnable ,
198203 }
199204 return appServiceImpl
200205}
@@ -320,7 +325,7 @@ func (impl *AppServiceImpl) UpdateDeploymentStatusForGitOpsPipelines(app *v1alph
320325 }
321326 if isSucceeded {
322327 impl .logger .Infow ("writing cd success event" , "gitHash" , gitHash , "pipelineOverride" , pipelineOverride )
323- go impl .WriteCDSuccessEvent (cdPipeline .AppId , cdPipeline .EnvironmentId , pipelineOverride )
328+ impl . asyncRunnable . Execute ( func () { impl .WriteCDSuccessEvent (cdPipeline .AppId , cdPipeline .EnvironmentId , pipelineOverride ) } )
324329 }
325330 } else {
326331 impl .logger .Debugw ("event received for older triggered revision" , "gitHash" , gitHash )
0 commit comments