Mercurial > gemma

comparison pkg/controllers/uploadedimports.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 f9bb06f2dbe3
children 3d497077f888
comparison
equal deleted inserted replaced
5488:a726a92ea5c9 5490:5f47eeea988d
13 13
14 package controllers 14 package controllers
15 15
16 import ( 16 import (
17 "fmt" 17 "fmt"
18 "log"
19 "net/http" 18 "net/http"
20 "os" 19 "os"
21 "strconv" 20 "strconv"
22 "time" 21 "time"
23 22
24 "gemma.intevation.de/gemma/pkg/auth" 23 "gemma.intevation.de/gemma/pkg/auth"
25 "gemma.intevation.de/gemma/pkg/common" 24 "gemma.intevation.de/gemma/pkg/common"
26 "gemma.intevation.de/gemma/pkg/imports" 25 "gemma.intevation.de/gemma/pkg/imports"
26 "gemma.intevation.de/gemma/pkg/log"
27 mw "gemma.intevation.de/gemma/pkg/middleware" 27 mw "gemma.intevation.de/gemma/pkg/middleware"
28 "gemma.intevation.de/gemma/pkg/misc" 28 "gemma.intevation.de/gemma/pkg/misc"
29 ) 29 )
30 30
31 const maxUploadSize = 25 * 1024 * 1024 31 const maxUploadSize = 25 * 1024 * 1024
160 req, 160 req,
161 string(kind), 161 string(kind),
162 fname, 162 fname,
163 maxUploadSize) 163 maxUploadSize)
164 if err != nil { 164 if err != nil {
165 log.Printf("error: %v\n", err) 165 log.Errorf("%v\n", err)
166 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) 166 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
167 return 167 return
168 } 168 }
169 169
170 job, err := create(req, dir) 170 job, err := create(req, dir)
171 if err != nil { 171 if err != nil {
172 if err2 := os.RemoveAll(dir); err2 != nil { 172 if err2 := os.RemoveAll(dir); err2 != nil {
173 log.Printf("warn: %v\n", err2) 173 log.Warnf("%v\n", err2)
174 } 174 }
175 if err2, ok := err.(badUploadParameterError); ok { 175 if err2, ok := err.(badUploadParameterError); ok {
176 http.Error(rw, string(err2), http.StatusBadRequest) 176 http.Error(rw, string(err2), http.StatusBadRequest)
177 return 177 return
178 } 178 }
179 log.Printf("error: %v\n", err) 179 log.Errorf("%v\n", err)
180 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) 180 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
181 return 181 return
182 } 182 }
183 183
184 serialized, err := common.ToJSONString(job) 184 serialized, err := common.ToJSONString(job)
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 session, _ := auth.GetSession(req) 191 session, _ := auth.GetSession(req)
200 session.User, 200 session.User,
201 sendEmail, 201 sendEmail,
202 serialized) 202 serialized)
203 203
204 if err != nil { 204 if err != nil {
205 log.Printf("error: %v\n", err) 205 log.Errorf("%v\n", err)
206 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) 206 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
207 return 207 return
208 } 208 }
209 209
210 log.Printf("info: added import #%d to queue\n", jobID) 210 log.Infof("added import #%d to queue\n", jobID)
211 211
212 result := struct { 212 result := struct {
213 ID int64 `json:"id"` 213 ID int64 `json:"id"`
214 }{ 214 }{
215 ID: jobID, 215 ID: jobID,