github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-29 03:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

implemented error hiding for ui.R and downloadHandler() cases

Browse Source
This commit is contained in:
Barbara Borges Ribeiro
2016-04-05 15:28:05 +01:00
parent 401065a23e
commit a692b3ced8
2 changed files with 26 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
R/middleware.R
View File

@@ -299,9 +299,7 @@ HandlerManager <- R6Class("HandlerManager",
if (reqSize > maxSize) {
return(list(status = 413L,
headers = list(
'Content-Type' = 'text/plain'
),
headers = list('Content-Type' = 'text/plain'),
body = 'Maximum upload size exceeded'))
}
else {
@@ -309,72 +307,30 @@ HandlerManager <- R6Class("HandlerManager",
}
},
call = .httpServer(
function (req) {
# expr <- handlers$invoke(req)
print("hello")
#withLogErrors(expr)
# return(list(status = 400L,
# headers = list(
# 'Content-Type' = 'text/plain'
# ),
# body = paste("An error has occurred. Check",
# "your logs or contact the app",
# "author for clarification.")))
withCallingHandlers(handlers$invoke(req),
error = function(cond) {
print("error")
return("error")
},
warning = function(cond) {
print("warning")
return("warning")
# if (inherits(cond, 'shiny.custom.error')) {
# return(list(status = 400L,
# headers = list(
# 'Content-Type' = 'text/plain'
# ),
# body = cond$message))
# }
# if (getOption('shiny.sanitize.errors', TRUE)) {
# return(list(status = 400L,
# headers = list(
# 'Content-Type' = 'text/plain'
# ),
# body = paste("An error has occurred. Check",
# "your logs or contact the app",
# "author for clarification.")))
# } else {
# return(list(status = 400L,
# headers = list(
# 'Content-Type' = 'text/plain'
# ),
# body = cond$message))
# }
}
)
# if (getOption('shiny.sanitize.errors', TRUE)) {
# return(list(status = 400L,
# headers = list(
# 'Content-Type' = 'text/plain'
# ),
# body = paste("An error has occurred. Check",
# "your logs or contact the app",
# "author for clarification.")))
# }
},
# if (getOption("shiny.sanitize.errors", TRUE)) {
# cond <- simpleError(paste("An error has occurred. Check your",
# "logs or contact the app author for",
# "clarification."))
# }
function(req,
full = getOption("shiny.fullstacktrace", FALSE),
offset = getOption("shiny.stacktraceoffset", TRUE)) {
# if (reqSize > maxSize) {
# return(list(status = 413L,
# headers = list(
# 'Content-Type' = 'text/plain'
# ),
# body = 'Maximum upload size exceeded'))
# }
withCallingHandlers(captureStackTraces(handlers$invoke(req)),
error = function(cond) {
# Don't print shiny.silent.error (i.e. validation errors)
if (inherits(cond, "shiny.silent.error")) return()
if (isTRUE(getOption("show.error.messages"))) {
printError(cond, full = full, offset = offset)
sanitizeErrors = getOption('shiny.sanitize.errors', TRUE)
if (inherits(cond, 'shiny.custom.error') || !sanitizeErrors) {
stop(cond$message, call. = FALSE)
}
else {
stop(paste("An error has occurred. Check your logs or",
"contact the app author for clarification."),
call. = FALSE)
}
}
}
)
},
getOption('shiny.sharedSecret')
),
onWSOpen = function(ws) {

6
R/shiny.R
View File

@@ -886,13 +886,11 @@ ShinySession <- R6Class(
# ..stacktraceon matches with the top-level ..stacktraceoff..
result <- try(shinyCallingHandlers(Context$new(getDefaultReactiveDomain(), '[download]')$run(
function() { ..stacktraceon..(download$func(tmpdata)) }
)))
)), silent = TRUE)
if (inherits(result, 'try-error')) {
cond <- attr(result, 'condition', exact = TRUE)
printError(cond)
unlink(tmpdata)
return(httpResponse(500, 'text/plain; charset=UTF-8',
enc2utf8(conditionMessage(cond))))
stop(result)
}
return(httpResponse(
200,