Mercurial > hg > digilib-old

comparison servlet/src/digilib/servlet/Scaler.java @ 572:800f2bb57f1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
slightly better logging
author robcast
date Wed, 22 Dec 2010 17:59:01 +0100
parents 6e8488acb499
children 3e3e1b7d659f 85e465e6a642
comparison
equal deleted inserted replaced
571:6e8488acb499 572:800f2bb57f1f
42 42
43 /** logger for accounting requests */ 43 /** logger for accounting requests */
44 protected static Logger accountlog = Logger.getLogger("account.request"); 44 protected static Logger accountlog = Logger.getLogger("account.request");
45 45
46 /** gengeral logger for this class */ 46 /** gengeral logger for this class */
47 protected static Logger logger = Logger.getLogger("digilib.servlet"); 47 protected static Logger logger = Logger.getLogger("digilib.scaler");
48 48
49 /** logger for authentication related */ 49 /** logger for authentication related */
50 protected static Logger authlog = Logger.getLogger("digilib.auth"); 50 protected static Logger authlog = Logger.getLogger("digilib.auth");
51 51
52 /** DocuDirCache instance */ 52 /** DocuDirCache instance */
218 String mt = null; 218 String mt = null;
219 if (jobTicket.hasOption("rawfile")) { 219 if (jobTicket.hasOption("rawfile")) {
220 mt = "application/octet-stream"; 220 mt = "application/octet-stream";
221 } 221 }
222 logger.debug("Sending RAW File as is."); 222 logger.debug("Sending RAW File as is.");
223 ServletOps.sendFile(fileToLoad.getFile(), mt, null, response); 223 ServletOps.sendFile(fileToLoad.getFile(), mt, null, response, logger);
224 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms"); 224 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
225 return; 225 return;
226 } 226 }
227 227
228 // if possible, send the image without actually having to transform it 228 // if possible, send the image without actually having to transform it
229 if (! jobTicket.isTransformRequired()) { 229 if (! jobTicket.isTransformRequired()) {
230 logger.debug("Sending File as is."); 230 logger.debug("Sending File as is.");
231 ServletOps.sendFile(fileToLoad.getFile(), null, null, response); 231 ServletOps.sendFile(fileToLoad.getFile(), null, null, response, logger);
232 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms"); 232 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
233 return; 233 return;
234 } 234 }
235 235
236 // check load of workers 236 // check load of workers
244 // submit job 244 // submit job
245 Future<DocuImage> jobResult = imageJobCenter.submit(job); 245 Future<DocuImage> jobResult = imageJobCenter.submit(job);
246 // wait for result 246 // wait for result
247 DocuImage img = jobResult.get(); 247 DocuImage img = jobResult.get();
248 // send image 248 // send image
249 ServletOps.sendImage(img, null, response); 249 ServletOps.sendImage(img, null, response, logger);
250 logger.debug("Job Processing Time: " 250 logger.debug("Job Processing Time: "
251 + (System.currentTimeMillis() - startTime) + "ms"); 251 + (System.currentTimeMillis() - startTime) + "ms");
252 252
253 } catch (ImageOpException e) { 253 } catch (ImageOpException e) {
254 logger.error(e.getClass() + ": " + e.getMessage()); 254 logger.error(e.getClass() + ": " + e.getMessage());
306 ServletOps.htmlMessage(msg, response); 306 ServletOps.htmlMessage(msg, response);
307 } else if (type == ErrMsg.CODE) { 307 } else if (type == ErrMsg.CODE) {
308 response.sendError(status, msg); 308 response.sendError(status, msg);
309 } else if (img != null) { 309 } else if (img != null) {
310 // default: image 310 // default: image
311 ServletOps.sendFile(img, null, null, response); 311 ServletOps.sendFile(img, null, null, response, logger);
312 } 312 }
313 } catch (Exception e) { 313 } catch (Exception e) {
314 logger.error("Error sending error!", e); 314 logger.error("Error sending error!", e);
315 } 315 }
316 316