getcompanion-ai/computer-host
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/computer-host.git synced 2026-04-15 06:04:38 +00:00
Code Issues 6 Projects Releases Packages Wiki Activity Actions

revert: undo 4 racing/reconcile fix commits

Browse source
This commit is contained in:
Harivansh Rathi 2026-04-11 18:11:25 +00:00
parent 637036b8c8
commit 0e5e989192
5 changed files with 29 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/daemon/lifecycle.go
View file

@ -32,7 +32,11 @@ func (d *Daemon) ListMachines(ctx context.Context) (*contracthost.ListMachinesRe
machines := make([]contracthost.Machine, 0, len(records))
for _, record := range records {
machines = append(machines, machineToContract(record))
reconciled, err := d.reconcileMachine(ctx, record.ID)
if err != nil {
return nil, err
}
machines = append(machines, machineToContract(*reconciled))
}
return &contracthost.ListMachinesResponse{Machines: machines}, nil
}
@ -386,8 +390,13 @@ func (d *Daemon) reconcileMachine(ctx context.Context, machineID contracthost.Ma
if !ready {
return record, nil
}
_ = d.personalizeGuest(ctx, record, *state)
guestSSHPublicKey, _ := d.readGuestSSHPublicKey(ctx, state.RuntimeHost)
if err := d.personalizeGuest(ctx, record, *state); err != nil {
return d.failMachineStartup(ctx, record, err.Error())
}
guestSSHPublicKey, err := d.readGuestSSHPublicKey(ctx, state.RuntimeHost)
if err != nil {
return d.failMachineStartup(ctx, record, err.Error())
}
record.RuntimeHost = state.RuntimeHost
record.TapDevice = state.TapName
record.Ports = defaultMachinePorts()