flush database

4 files changed, 19 insertions, 5 deletions

diff --git a/app/relay/queue.js b/app/relay/queue.js
index 6c65e06..9dd987a 100644
--- a/app/relay/queue.js
+++ b/app/relay/queue.js
@@ -4,7 +4,12 @@ let queue = []
 let active = false
 let status = 'waiting'
 
-export const is_active = () => active && queue.length
+export const is_active = () => {
+  if (active && queue.length) {
+    return true
+  }
+  return active = false
+}
 export const get_status = () => status
 export const activate = () => {
   active = true
diff --git a/app/relay/runner.js b/app/relay/runner.js
index 734e3ea..1041a94 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -309,7 +309,7 @@ export function run_next_task(){
   if (queue.is_active()) {
     console.log(queue.list_tasks())
     const task = queue.get_next_task()
-    return run_task(task)
+    return run_task(task, false, true)
   }
 }
 
diff --git a/migrations/20170628234104_createTasks.js b/migrations/20170628234104_createTasks.js
index 3c3a805..8e3e44b 100644
--- a/migrations/20170628234104_createTasks.js
+++ b/migrations/20170628234104_createTasks.js
@@ -11,6 +11,8 @@ exports.up = function(knex, Promise) {
     table.string('activity')
     table.string('checkpoint')
     table.string('dataset')
+    table.string('processor')
+    table.string('started')
     table.integer('dataset_id')
     table.integer('folder_id')
     table.integer('file_id')
diff --git a/test/module/test.pl b/test/module/test.pl
index 5e25d84..1fad6c7 100755
--- a/test/module/test.pl
+++ b/test/module/test.pl
@@ -10,7 +10,8 @@ my $train;
 my $test;
 GetOptions (
   "train"  => \$train,
-  "test"  => \$test
+  "test"  => \$test,
+  "wait"  => \$wait,
 )
 or die("Error in command line arguments\n");
 
@@ -18,13 +19,19 @@ print "hello i am a perl script :o)\n";
 
 if ($train) {
   print "we are training...\n";
-  for (my $i = 0; $i < 10; $i++) {
+  for (my $i = 0; $i < 11; $i++) {
     print "$i...\n";
     sleep 1;
   }
 } elsif ($test) {
   print "we are testing...\n";
-  for (my $i = 0; $i < 10; $i++) {
+  for (my $i = 0; $i < 11; $i++) {
+    print "$i...\n";
+    sleep 1;
+  }
+} elsif ($wait) {
+  print "we are waiting...\n";
+  for (my $i = 0; $i < 5; $i++) {
     print "$i...\n";
     sleep 1;
   }