htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong environment id at monitoring

Browse Source 
data for created or updated environments.
This commit is contained in:
Maximilian Paß
2022-10-13 21:51:53 +01:00
committed by Sebastian Serth
parent a1d30f00c6
commit 5d54b0f786
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/environment/nomad_environment.go
View File

@ -31,7 +31,7 @@ type NomadEnvironment struct {
idleRunners storage.Storage[runner.Runner]
}
func NewNomadEnvironment(apiClient nomad.ExecutorAPI, jobHCL string) (*NomadEnvironment, error) {
func NewNomadEnvironment(id dto.EnvironmentID, apiClient nomad.ExecutorAPI, jobHCL string) (*NomadEnvironment, error) {
job, err := parseJob(jobHCL)
if err != nil {
return nil, fmt.Errorf("error parsing Nomad job: %w", err)
@ -39,14 +39,14 @@ func NewNomadEnvironment(apiClient nomad.ExecutorAPI, jobHCL string) (*NomadEnvi
e := &NomadEnvironment{apiClient, jobHCL, job, nil}
e.idleRunners = storage.NewMonitoredLocalStorage[runner.Runner](monitoring.MeasurementIdleRunnerNomad,
runner.MonitorEnvironmentID[runner.Runner](e.ID()), time.Minute)
runner.MonitorEnvironmentID[runner.Runner](id), time.Minute)
return e, nil
}
func NewNomadEnvironmentFromRequest(
apiClient nomad.ExecutorAPI, jobHCL string, id dto.EnvironmentID, request dto.ExecutionEnvironmentRequest) (
*NomadEnvironment, error) {
environment, err := NewNomadEnvironment(apiClient, jobHCL)
environment, err := NewNomadEnvironment(id, apiClient, jobHCL)
if err != nil {
return nil, err
}