Skip to content

Commit 7cdaf0d

Browse files
committed
pr feedback
1 parent 3b20859 commit 7cdaf0d

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

internal/config/config.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -459,31 +459,31 @@ func registerDataPlaneFlags(fs *flag.FlagSet) {
459459
"collection or error monitoring. This includes absolute paths or regex patterns",
460460
)
461461

462-
// Nginx Reload Backoff Flags
462+
// NGINX Reload Backoff Flags
463463
fs.Duration(
464464
NginxReloadBackoffInitialIntervalKey,
465465
DefNginxReloadBackoffInitialInterval,
466-
"The client backoff initial interval, value in seconds")
466+
"The NGINX reload backoff initial interval, value in seconds")
467467

468468
fs.Duration(
469469
NginxReloadBackoffMaxIntervalKey,
470470
DefNginxReloadBackoffMaxInterval,
471-
"The client backoff max interval, value in seconds")
471+
"The NGINX reload backoff max interval, value in seconds")
472472

473473
fs.Duration(
474474
NginxReloadBackoffMaxElapsedTimeKey,
475475
DefNginxReloadBackoffMaxElapsedTime,
476-
"The client backoff max elapsed time, value in seconds")
476+
"The NGINX reload backoff max elapsed time, value in seconds")
477477

478478
fs.Float64(
479479
NginxReloadBackoffRandomizationFactorKey,
480480
DefNginxReloadBackoffRandomizationFactor,
481-
"The client backoff randomization factor, value float")
481+
"The NGINX reload backoff randomization factor, value float")
482482

483483
fs.Float64(
484484
NginxReloadBackoffMultiplierKey,
485485
DefNginxReloadBackoffMultiplier,
486-
"The client backoff multiplier, value float")
486+
"The NGINX reload backoff multiplier, value float")
487487
}
488488

489489
func registerCommonFlags(fs *flag.FlagSet) {

internal/resource/nginx_instance_operator.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,11 @@ func (i *NginxInstanceOperator) Validate(ctx context.Context, instance *mpi.Inst
6363
func (i *NginxInstanceOperator) Reload(ctx context.Context, instance *mpi.Instance) error {
6464
var reloadTime time.Time
6565
var errorsFound error
66+
pid := instance.GetInstanceRuntime().GetProcessId()
67+
6668
slog.InfoContext(ctx, "Reloading NGINX PID", "pid",
67-
instance.GetInstanceRuntime().GetProcessId())
69+
pid)
6870

69-
pid := instance.GetInstanceRuntime().GetProcessId()
7071
workers := i.nginxProcessOperator.NginxWorkerProcesses(ctx, pid)
7172

7273
if len(workers) > 0 {
@@ -80,7 +81,7 @@ func (i *NginxInstanceOperator) Reload(ctx context.Context, instance *mpi.Instan
8081

8182
go i.monitorLogs(ctx, errorLogs, logErrorChannel)
8283

83-
err := i.executer.KillProcess(instance.GetInstanceRuntime().GetProcessId())
84+
err := i.executer.KillProcess(pid)
8485
if err != nil {
8586
return err
8687
}
@@ -93,7 +94,7 @@ func (i *NginxInstanceOperator) Reload(ctx context.Context, instance *mpi.Instan
9394
i.checkWorkers(ctx, instance.GetInstanceMeta().GetInstanceId(), reloadTime, processes)
9495
}
9596

96-
slog.InfoContext(ctx, "NGINX reloaded", "process_id", instance.GetInstanceRuntime().GetProcessId())
97+
slog.InfoContext(ctx, "NGINX reloaded", "process_id", pid)
9798

9899
numberOfExpectedMessages := len(errorLogs)
99100

0 commit comments

Comments
 (0)