Skip to content

Commit 047b3b2

Browse files
committed
Resolve merge conflict
- Conflicted with commit #1de89b9 "Replace Origin.AudienceUrl with Origin.TokenAudience and mark hidden"
1 parent 6727cc8 commit 047b3b2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

self_monitor/self_monitor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ func doSelfMonitorOrigin(ctx context.Context) {
391391
log.Debug("Starting a new self-test monitoring cycle")
392392
fileTests := server_utils.TestFileTransferImpl{}
393393
issuerUrl := param.Server_ExternalWebUrl.GetString()
394-
ok, err := fileTests.RunTests(ctx, param.Origin_Url.GetString(), config.GetServerAudience(), issuerUrl, server_utils.ServerSelfTest)
394+
ok, err := fileTests.RunTests(ctx, param.Origin_Url.GetString(), param.Origin_TokenAudience.GetString(), issuerUrl, server_utils.ServerSelfTest)
395395
if ok && err == nil {
396396
log.Debugln("Self-test monitoring cycle succeeded at", time.Now().Format(time.UnixDate))
397397
metrics.SetComponentHealthStatus(metrics.OriginCache_XRootD, metrics.StatusOK, "Self-test monitoring cycle succeeded at "+time.Now().Format(time.RFC3339))

0 commit comments

Comments
 (0)