Update running mecanism

main.R

@@ -660,6 +660,12 @@ generate_pages_server <- function() {
   res <- res + '\t\tif (!file.exists(paste0(input$results_dir,"/logs/runlog.txt"))){\n'
   res <- res + '\t\t\tfile.create(paste0(input$results_dir,"/logs/runlog.txt"))\n'
   res <- res + '\t\t}\n'
+  res <- res + '\t\tif (file.exists(paste0(input$results_dir,"/logs/workflow_end.ok"))){\n'
+  res <- res + '\t\t\tfile.remove(paste0(input$results_dir,"/logs/workflow_end.ok"))\n'
+  res <- res + '\t\t}\n'
+  res <- res + '\t\tif (file.exists(paste0(input$results_dir,"/logs/workflow_end.error"))){\n'
+  res <- res + '\t\t\tfile.remove(paste0(input$results_dir,"/logs/workflow_end.error"))\n'
+  res <- res + '\t\t}\n'
 
   # res <- res + '\t\tforcerun = compare_params(input$results_dir)\n'
   # res <- res + '\t\tif (length(forcerun>1)){\n'
@@ -1049,6 +1055,7 @@ generate_app <- function() {
   # Observe if the workflow is running
   res <- res + '\tobserve({\n'
   res <- res + '\t\trv$timer()\n'
+  res <- res + '\t\tif (!file.exists(paste0(input$results_dir,"/logs/workflow.running"))){rv$running = F}\n'
   res <- res + '\t\tif (isolate(rv$running)){\n'
   res <- res + '\t\t\tif (file.exists(paste0(input$results_dir,"/logs/runlog.txt"))){\n'
   res <- res + '\t\t\t\trv$textstream <- paste(readLines(paste0(input$results_dir,"/logs/runlog.txt"),warn=F), collapse = "<br/>")\n'
@@ -1065,15 +1072,11 @@ generate_app <- function() {
   res <- res + '\t\t\t\taddResourcePath("results", input$results_dir)\n'
   res <- res + '\t\t\t\toutUI = tags$iframe(src=paste0("results/multiqc_report.html"),width="100%", height="900px")\n'
   res <- res + '\t\t\t\toutput$report_html = renderUI(outUI)\n'
-  res <- res + '\t\t\t\tfile.remove(paste0(input$results_dir,"/logs/workflow_end.ok"))\n'
-  res <- res + '\t\t\t\tfile.remove(paste0(input$results_dir,"/logs/workflow.running"))\n'
   res <- res + '\t\t\t}\n'
   res <- res + '\t\t\telse if (file.exists(paste0(input$results_dir,"/logs/workflow_end.error"))){\n'
   res <- res + '\t\t\t\tisolate({rv$running = F})\n'
   res <- res + '\t\t\t\ttoggle_inputs(reactiveValuesToList(input),T,F)\n'
   res <- res + '\t\t\t\toutput$report_html = renderUI(HTML(paste(readLines(paste0(input$results_dir,"/logs/workflow_end.error"),warn=F), collapse = "<br/>")))\n'
-  res <- res + '\t\t\t\tfile.remove(paste0(input$results_dir,"/logs/workflow_end.error"))\n'
-  res <- res + '\t\t\t\tfile.remove(paste0(input$results_dir,"/logs/workflow.running"))\n'
   res <- res + '\t\t\t}\n'
   #res <- res + '\t\t\tshinyjs::runjs(\n'
   #res <- res + '\t\t\t\t"var objDiv = document.getElementById(\'run_out\'); objDiv.scrollTop = objDiv.scrollHeight;"\n'