Skip to content

Commit

Permalink
try to change future 'plan' depending on the OS
Browse files Browse the repository at this point in the history
  • Loading branch information
eblondel committed Dec 3, 2024
1 parent 2b6c1bb commit 37044e6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions global.R
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ source("assets/commons.R")

#config
#---------------------------------------------------------------------------------------
#config_file = "D:/Documents/DEV/Packages/geoflow-shiny_config_inrae.yml"
config_file <- "resources/config.yml"
config_file = "D:/Documents/DEV/Packages/geoflow-shiny_config_inrae.yml"
#config_file <- "resources/config.yml"
#test shiny server resource file existence (if mount through docker container)
shiny_server_config_file <- "/etc/geoflow-shiny/config.yml"
if(file.exists(shiny_server_config_file)) config_file <- shiny_server_config_file
Expand All @@ -25,7 +25,11 @@ loadAppPackages()

#global settings
#---------------------------------------------------------------------------------------
future::plan(multisession)
if(Sys.info()[["sysname"]] == "Windows"){
future::plan(multisession)
}else{
future::plan(multicore)
}
GEOFLOW_DATA_DIR <- appConfig$data_dir_local
GEOFLOW_SHINY_ENV <- new.env()

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "geoflow-shiny",
"version": "0.2.20241203",
"version": "0.2.20241203-1",
"date": "2024-12-03",
"dependencies": [
{"package": "dotenv", "version": "1.0.3", "repos": "https://cran.r-project.org"},
Expand Down

0 comments on commit 37044e6

Please sign in to comment.