Mercurial > gemma

comparison pkg/controllers/srimports.go @ 5490:5f47eeea988d logging

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use own logging package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 20 Sep 2021 17:45:39 +0200
parents 850f5847d18a
children 6270951dda28
comparison
equal deleted inserted replaced
5488:a726a92ea5c9 5490:5f47eeea988d
15 15
16 import ( 16 import (
17 "archive/zip" 17 "archive/zip"
18 "encoding/hex" 18 "encoding/hex"
19 "fmt" 19 "fmt"
20 "log"
21 "net/http" 20 "net/http"
22 "os" 21 "os"
23 "path/filepath" 22 "path/filepath"
24 "strconv" 23 "strconv"
25 "strings" 24 "strings"
30 29
31 "gemma.intevation.de/gemma/pkg/auth" 30 "gemma.intevation.de/gemma/pkg/auth"
32 "gemma.intevation.de/gemma/pkg/common" 31 "gemma.intevation.de/gemma/pkg/common"
33 "gemma.intevation.de/gemma/pkg/config" 32 "gemma.intevation.de/gemma/pkg/config"
34 "gemma.intevation.de/gemma/pkg/imports" 33 "gemma.intevation.de/gemma/pkg/imports"
34 "gemma.intevation.de/gemma/pkg/log"
35 "gemma.intevation.de/gemma/pkg/misc" 35 "gemma.intevation.de/gemma/pkg/misc"
36 "gemma.intevation.de/gemma/pkg/models" 36 "gemma.intevation.de/gemma/pkg/models"
37 37
38 mw "gemma.intevation.de/gemma/pkg/middleware" 38 mw "gemma.intevation.de/gemma/pkg/middleware"
39 ) 39 )
147 func importSoundingResult(rw http.ResponseWriter, req *http.Request) { 147 func importSoundingResult(rw http.ResponseWriter, req *http.Request) {
148 148
149 sr := new(imports.SoundingResult) 149 sr := new(imports.SoundingResult)
150 150
151 if err := fetchSoundingResultMetaOverrides(sr, req); err != nil { 151 if err := fetchSoundingResultMetaOverrides(sr, req); err != nil {
152 log.Printf("error: %v\n", err) 152 log.Errorf("%v\n", err)
153 http.Error(rw, "error: "+err.Error(), http.StatusBadRequest) 153 http.Error(rw, "error: "+err.Error(), http.StatusBadRequest)
154 return 154 return
155 } 155 }
156 156
157 dir, err := fetchSoundingResult(req) 157 dir, err := fetchSoundingResult(req)
158 if err != nil { 158 if err != nil {
159 log.Printf("error: %v\n", err) 159 log.Errorf("%v\n", err)
160 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) 160 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
161 return 161 return
162 } 162 }
163 sr.Dir = dir 163 sr.Dir = dir
164 164
165 serialized, err := common.ToJSONString(sr) 165 serialized, err := common.ToJSONString(sr)
166 if err != nil { 166 if err != nil {
167 log.Printf("error: %v\n", err) 167 log.Errorf("%v\n", err)
168 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) 168 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
169 return 169 return
170 } 170 }
171 171
172 session, _ := auth.GetSession(req) 172 session, _ := auth.GetSession(req)
181 session.User, 181 session.User,
182 sendEmail, 182 sendEmail,
183 serialized) 183 serialized)
184 184
185 if err != nil { 185 if err != nil {
186 log.Printf("error: %v\n", err) 186 log.Errorf("%v\n", err)
187 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) 187 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
188 return 188 return
189 } 189 }
190 190
191 log.Printf("info: added import #%d to queue\n", jobID) 191 log.Infof("added import #%d to queue\n", jobID)
192 192
193 result := struct { 193 result := struct {
194 ID int64 `json:"id"` 194 ID int64 `json:"id"`
195 }{ 195 }{
196 ID: jobID, 196 ID: jobID,
281 281
282 // If there are no XYZ data we cant help the user anyway. 282 // If there are no XYZ data we cant help the user anyway.
283 if noXYZ { 283 if noXYZ {
284 code = http.StatusBadRequest 284 code = http.StatusBadRequest
285 if err2 := os.RemoveAll(dir); err2 != nil { 285 if err2 := os.RemoveAll(dir); err2 != nil {
286 log.Printf("error: %v\n", err2) 286 log.Errorf("%v\n", err2)
287 } 287 }
288 } else if result.Token, err = misc.MakeTempFile(dir); err != nil { 288 } else if result.Token, err = misc.MakeTempFile(dir); err != nil {
289 if err2 := os.RemoveAll(dir); err2 != nil { 289 if err2 := os.RemoveAll(dir); err2 != nil {
290 log.Printf("error: %v\n", err2) 290 log.Errorf("%v\n", err2)
291 } 291 }
292 return 292 return
293 } 293 }
294 294
295 result.Messages = messages 295 result.Messages = messages