mirror of
https://github.com/psviderski/uncloud.git
synced 2026-10-06 13:18:58 +00:00
fix: increase wait time for machine to 5 min, discard unknown when decoding json to proto
This commit is contained in:
1 parent
1046396edc
commit
5e9b883ad5
2 files changed
+5
-2
No files matched your search
@@ -79,10 +79,13 @@ func (s *Store) ListMachines(ctx context.Context) ([]*pb.MachineInfo, error) {
|
||||
if err = rows.Scan(&mJSON); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
protojsonParser := protojson.UnmarshalOptions{DiscardUnknown: true}
|
||||
var m pb.MachineInfo
|
||||
if err = protojson.Unmarshal([]byte(mJSON), &m); err != nil {
|
||||
if err = protojsonParser.Unmarshal([]byte(mJSON), &m); err != nil {
|
||||
return nil, fmt.Errorf("unmarshal machine info: %w", err)
|
||||
}
|
||||
|
||||
if err = m.Network.Validate(); err != nil {
|
||||
slog.Error("Invalid network configuration for machine in store", "id", m.Id, "err", err)
|
||||
continue
|
||||
|
||||
Reference in new issue
Block a user