@@ -262,7 +262,7 @@ func (r *Runner) runBuilds(ctx context.Context, fn string) bool {
262
262
}
263
263
r .setServiceState (normalizeByEnvVarRules (sv .Name ), status )
264
264
}()
265
- if ! r .startProcess (ctx , sv , - 1 , - 1 , fn , buf ) {
265
+ if ! r .startProcess (ctx , sv , - 1 , fn , buf ) {
266
266
mu .Lock ()
267
267
ok = false
268
268
localOk = false
@@ -279,29 +279,26 @@ func (r *Runner) runPermanent(changedFileName string) *oversight.Tree {
279
279
tree := oversight .New (
280
280
oversight .WithRestartStrategy (oversight .OneForAll ()),
281
281
oversight .NeverHalt ())
282
- for j , sv := range r .Processes {
282
+ for _ , sv := range r .Processes {
283
283
if strings .HasPrefix (sv .Name , "build" ) {
284
284
continue
285
285
}
286
286
maxProc := r .Formation [sv .Name ]
287
- portCount := j * 100
288
287
for i := 0 ; i < maxProc ; i ++ {
289
- sv , i , pc := sv , i , portCount
290
288
if sv .Restart == Loop || sv .Restart == Temporary || sv .Restart == OnFailure {
291
289
continue
292
290
}
293
291
_ = tree .Add (oversight.ChildProcessSpecification {
294
292
Name : sv .Name ,
295
293
Restart : oversight .Permanent (),
296
294
Start : func (ctx context.Context ) error {
297
- ok := r .startProcess (ctx , sv , i , pc , changedFileName , io .Discard )
295
+ ok := r .startProcess (ctx , sv , i , changedFileName , io .Discard )
298
296
if ! ok && sv .Restart == OnFailure {
299
297
return errors .New ("restarting on failure" )
300
298
}
301
299
return nil
302
300
},
303
301
})
304
- portCount ++
305
302
}
306
303
}
307
304
return tree
@@ -311,44 +308,39 @@ func (r *Runner) runEphemeral(ctx context.Context, changedFileName string) {
311
308
tree := oversight .New (
312
309
oversight .WithRestartStrategy (oversight .OneForAll ()),
313
310
oversight .NeverHalt ())
314
- for j , sv := range r .Processes {
311
+ for _ , sv := range r .Processes {
315
312
if strings .HasPrefix (sv .Name , "build" ) {
316
313
continue
317
314
}
318
315
maxProc := r .Formation [sv .Name ]
319
- portCount := j * 100
320
316
for i := 0 ; i < maxProc ; i ++ {
321
- sv , i , pc := sv , i , portCount
322
317
if sv .Restart == Loop {
323
318
_ = tree .Add (oversight.ChildProcessSpecification {
324
319
Name : sv .Name ,
325
320
Restart : oversight .Permanent (),
326
321
Start : func (ctx context.Context ) error {
327
- r .startProcess (ctx , sv , i , pc , changedFileName , io .Discard )
322
+ r .startProcess (ctx , sv , i , changedFileName , io .Discard )
328
323
return nil
329
324
},
330
325
})
331
- portCount ++
332
326
} else if sv .Restart == Temporary {
333
327
_ = tree .Add (oversight.ChildProcessSpecification {
334
328
Name : sv .Name ,
335
329
Restart : oversight .Temporary (),
336
330
Start : func (ctx context.Context ) error {
337
- r .startProcess (ctx , sv , i , pc , changedFileName , io .Discard )
331
+ r .startProcess (ctx , sv , i , changedFileName , io .Discard )
338
332
return nil
339
333
},
340
334
})
341
- portCount ++
342
335
} else if sv .Restart == OnFailure {
343
336
_ = tree .Add (oversight.ChildProcessSpecification {
344
337
Name : sv .Name ,
345
338
Restart : oversight .Transient (),
346
339
Start : func (ctx context.Context ) error {
347
- r .startProcess (ctx , sv , i , pc , changedFileName , io .Discard )
340
+ r .startProcess (ctx , sv , i , changedFileName , io .Discard )
348
341
return nil
349
342
},
350
343
})
351
- portCount ++
352
344
}
353
345
}
354
346
}
@@ -373,7 +365,7 @@ func normalizeByEnvVarRules(name string) string {
373
365
return strings .ToUpper (buf .String ())
374
366
}
375
367
376
- func (r * Runner ) startProcess (ctx context.Context , sv * ProcessType , procCount , portCount int , changedFileName string , buf io.Writer ) bool {
368
+ func (r * Runner ) startProcess (ctx context.Context , sv * ProcessType , procCount int , changedFileName string , buf io.Writer ) bool {
377
369
pr , pw := io .Pipe ()
378
370
procName := sv .Name
379
371
if procCount > - 1 {
0 commit comments