Mercurial > gemma
view pkg/controllers/manualimports.go @ 3678:8f58851927c0
client: make layer factory only return new layer config for individual maps
instead of each time it is invoked. The purpose of the factory was to support multiple maps with individual layers.
But returning a new config each time it is invoked leads to bugs that rely on the layer's state. Now this factory
reuses the same objects it created before, per map.
author | Markus Kottlaender <markus@intevation.de> |
---|---|
date | Mon, 17 Jun 2019 17:31:35 +0200 |
parents | 09f9ae3d0526 |
children | 1458c9b0fdaa |
line wrap: on
line source
// This is Free Software under GNU Affero General Public License v >= 3.0 // without warranty, see README.md and license for details. // // SPDX-License-Identifier: AGPL-3.0-or-later // License-Filename: LICENSES/AGPL-3.0.txt // // Copyright (C) 2018 by via donau // – Österreichische Wasserstraßen-Gesellschaft mbH // Software engineering by Intevation GmbH // // Author(s): // * Sascha L. Teichmann <sascha.teichmann@intevation.de> // * Raimund Renkert <raimund.renkert@intevation.de> package controllers import ( "database/sql" "log" "net/http" "time" "gemma.intevation.de/gemma/pkg/auth" "gemma.intevation.de/gemma/pkg/common" "gemma.intevation.de/gemma/pkg/imports" "gemma.intevation.de/gemma/pkg/models" "github.com/gorilla/mux" ) func importModel(req *http.Request) interface{} { kind := mux.Vars(req)["kind"] ctor := imports.ImportModelForJobKind(imports.JobKind(kind)) if ctor == nil { log.Printf("error: Unknown job kind '%s'.\n", kind) panic(http.ErrAbortHandler) } return ctor() } func manualImport( input interface{}, req *http.Request, _ *sql.Conn, ) (jr JSONResult, err error) { kind := imports.JobKind(mux.Vars(req)["kind"]) what := imports.ConvertToInternal(kind, input) if what == nil { err = JSONError{ Code: http.StatusInternalServerError, Message: "Unable to convert import models", } return } var serialized string if serialized, err = common.ToJSONString(what); err != nil { return } var ( due time.Time trys *int waitRetry *time.Duration email bool ) if qctg, ok := input.(models.QueueConfigurationGetter); ok { qct := qctg.GetQueueConfiguration() if qct.Due != nil { due = qct.Due.Time } trys = qct.Trys if qct.WaitRetry != nil { waitRetry = &qct.WaitRetry.Duration } } if etg, ok := input.(models.EmailTypeGetter); ok { email = etg.GetEmailType().Email } session, _ := auth.GetSession(req) var jobID int64 if jobID, err = imports.AddJob( kind, due, trys, waitRetry, session.User, email, serialized, ); err != nil { return } log.Printf("info: added import #%d to queue\n", jobID) result := struct { ID int64 `json:"id"` }{ ID: jobID, } jr = JSONResult{ Code: http.StatusCreated, Result: &result, } return }