Skip to content

tools:::httpdPort is a dynamic variable #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
psolymos wants to merge 2 commits into
base: master
Choose a base branch
from
Open

tools:::httpdPort is a dynamic variable #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68024f4
Change tools:::httpdPort to tools:::httpdPort()
psolymos Dec 16, 2020
a2a73cf
R version dependency added
psolymos Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Package: Rook
Type: Package
Title: Rook - a web server interface for R
Version: 1.1-1
Date: 2014-10-20
Version: 1.1-2
Date: 2020-12-16
Author: Jeffrey Horner <jeffrey.horner@gmail.com>
Maintainer: Jeffrey Horner <jeffrey.horner@gmail.com>
Description: This package contains the Rook specification and
convenience software for building and running Rook applications. To
get started, be sure and read the 'Rook' help file first.
Depends: R (>= 2.13.0)
Depends: R (>= 3.2.0)
Imports: utils, tools, methods, brew
License: GPL-2
LazyLoad: yes
20 changes: 10 additions & 10 deletions R/Rhttpd.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Rhttpd <- setRefClass(
paste('http://',listenAddr,':',listenPort,appList[[i]]$path,sep='')
},
launch = function(...){
.self$start(quiet=TRUE)
.self$start(quiet=TRUE)
# Try to create a new app from the supplied arguments
app <- RhttpdApp$new(...)
if (add(app)){
Expand Down Expand Up @@ -156,9 +156,9 @@ Rhttpd <- setRefClass(

if(grepl('rstudio',base::.Platform$GUI,ignore.case=TRUE)){
# RStudio has already set up host and port
listenPort <<- tools:::httpdPort
listenPort <<- tools:::httpdPort()
if (!missing(port))
warning("RStudio has already started the web server on port ",tools:::httpdPort)
warning("RStudio has already started the web server on port ",tools:::httpdPort())
return(invisible())
}

Expand Down Expand Up @@ -208,15 +208,15 @@ Rhttpd <- setRefClass(
#.self$httpdOrig <- tools:::httpd
#assignInNamespace(
# app$name,
# function(path,query,postBody,headers)
# .self$handler(app$name,path,query,postBody,headers),
# function(path,query,postBody,headers)
# .self$handler(app$name,path,query,postBody,headers),
# 'tools'
#)
} else {
assign(
app$name,
function(path,query,postBody,headers)
.self$handler(app$name,path,query,postBody,headers),
app$name,
function(path,query,postBody,headers)
.self$handler(app$name,path,query,postBody,headers),
tools:::.httpd.handlers.env
)
}
Expand Down Expand Up @@ -292,10 +292,10 @@ Rhttpd <- setRefClass(
),
env
)

if(exists("HTTP_REQUEST_METHOD", env)){
assign('REQUEST_METHOD',get("HTTP_REQUEST_METHOD", env) ,env)
} else {
} else {
assign('REQUEST_METHOD',ifelse(is.null(postBody),'GET','POST'),env)
}

Expand Down