Bug fixing, improved live test

Author: fikipollo

.gitignore

@@ -1,2 +1,3 @@
 .idea/
 *.pyc
+server.cfg

PySiQ.py

@@ -203,8 +203,11 @@ def remove_task(self, task_id):
         try:
             self.lock.acquire()  # LOCK CACHE
             if self.tasks.has_key(task_id):
+                logging.debug("Removing task " + str(task_id))
                 self.queue.remove(self.tasks.get(task_id))
                 del self.tasks[task_id]
+            else:
+                logging.debug("Failed removing task " + str(task_id) + ". Not found.")
         finally:
             self.lock.release() #UNLOCK CACHE
 

README.md

@@ -9,7 +9,6 @@
    * [Using PySiQ as a self-contained service](#using-pysiq-as-a-self-contained-service)
 
 <!-- Added by: rhernandez, at: 2018-04-18T21:53+02:00 -->
-
 <!--te-->
 
 # Introduction

VERSION

@@ -1 +1 @@
-v0.3 APRIL 2018 PySiQ, a Python Simple Queue system 
+v0.4 August 2018 PySiQ, a Python Simple Queue system 

runserver.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 try:
     from server import Application
 except Exception as ex:

server.cfg renamed to server.default.cfg

@@ -18,6 +18,7 @@
 import json
 from imp import load_source
 from inspect import getmembers, isfunction
+from shutil import copyfile
 
 class Application(object):
     #******************************************************************************************************************
@@ -68,17 +69,28 @@ def enqueue():
         def check_status(task_id):
             if request.method == "OPTIONS":
                 return jsonify(True)
-            return jsonify({'success': True, 'status': self.queue_instance.check_status(task_id).name})
+            try: # Fix issue #2 reported by @jeremydouglass
+                return jsonify({'success': True, 'status': self.queue_instance.check_status(task_id).name}) # This may work depending on the version of python
+            except Exception as e:
+                return jsonify({'success': True, 'status': self.queue_instance.check_status(task_id)})
 
         @self.app.route(self.settings.get("SERVER_SUBDOMAIN", "") + '/api/result/<path:task_id>', methods=['OPTIONS', 'GET'])
         def get_result(task_id):
             if request.method == "OPTIONS":
                 return jsonify(True)
-            result = self.queue_instance.get_result(task_id)
+            remove = (request.args.get('remove', default=0) == 0)
+            result = self.queue_instance.get_result(task_id, remove)
             if isinstance(result, TaskStatus):
                 return jsonify({'success': False, 'message': "Task couldn't be found in queue"})
             return jsonify({'success': True, 'result': result})
 
+        @self.app.route(self.settings.get("SERVER_SUBDOMAIN", "") + '/api/remove/<path:task_id>', methods=['OPTIONS', 'DELETE'])
+        def remove_task(task_id):
+            if request.method == "OPTIONS":
+                return jsonify(True)
+            self.queue_instance.remove_task(task_id)
+            return jsonify({'success': True})
+
     def load_functions(self):
         functions = {}
         for functions_source in self.settings.get("FUNCTIONS_DIRS", []):
@@ -114,6 +126,10 @@ def log(self, message, type="info"):
 
 def read_settings_file():
     conf_path = os.path.dirname(os.path.realpath(__file__)) + "/server.cfg"
+    # Copy the default settings
+    if not os.path.isfile(conf_path):
+        copyfile(os.path.dirname(os.path.realpath(__file__)) + "/server.default.cfg", conf_path)
+
     settings = {}
     if os.path.isfile(conf_path):
         config = json.load(open(conf_path))

server.py

@@ -53,7 +53,7 @@
           if (response.success) {
             task.result = response.result;
           } else {
-            task.status = "UNABLE TO GET THE RESULT.";
+            task.result = "UNABLE TO GET THE RESULT.";
           }
           sessionStorage.tasks = JSON.stringify($scope.tasks);
           $scope.$apply();
@@ -81,11 +81,13 @@
               depend: depend,
               incompatible: incompatible,
               status: "UNKNOWN",
-              result: "-"
+              result: "-",
+              elapsed_time: 0
             })
             $scope.$apply();
             sessionStorage.tasks = JSON.stringify($scope.tasks);
             alert("New task was succesfully enqueued!");
+            $scope.initNewTask();
           } else {
             alert("Oops! Something went wrong when trying to enqueue your new task!");
           }
@@ -98,6 +100,29 @@
       $scope.tasks = [];
       sessionStorage.tasks = JSON.stringify($scope.tasks);
     }
+
+    $scope.initNewTask = function() {
+      $scope.task_name = "Task " + ($scope.tasks.length + 1);
+      $scope.n_seconds = Math.floor(Math.random() * 19) + 1;
+      $scope.task_result = "Task " + ($scope.tasks.length + 1) + " is done!";
+    }
+
+
+    $scope.updateElapsedTime = function() {
+      for (var i in $scope.tasks) {
+        if ($scope.tasks[i].status !== "FINISHED" && $scope.tasks[i].status !== "FAILED") {
+          $scope.tasks[i].elapsed_time += 1
+        }
+      }
+    };
+
+    $scope.initNewTask();
+
+    //Launch the intervar
+    setInterval(function() {
+      $scope.updateElapsedTime();
+    }, 1000);
+
     //Launch the intervar
     setInterval(function() {
       for (var i in $scope.tasks) {
@@ -130,19 +155,20 @@ <h1>PySiQ server example</h1>
             <label for="task_name">A message to show when task ends:</label>
             <input type="text" class="form-control" id="task_result" ng-model="task_result">
           </div>
-          <button class="btn btn-default" ng-click="addNewTask(task_name, n_seconds, task_result, [], [])">Run it!</button>
+          <button class="btn btn-primary" ng-click="addNewTask(task_name, n_seconds, task_result, [], [])">Run it!</button>
         </div>
       </div>
     </div>
     <div class="panel panel-default">
-      <div class="panel-heading">Queue content <a style="margin-top:-5px;"class="btn btn-danger btn-sm pull-right" ng-click="clearTasks()"><span class="glyphicon glyphicon-trash"></span> Clear tasks</a></div>
+      <div class="panel-heading">Queue content (2 workers) <a style="margin-top:-5px;" class="btn btn-danger btn-sm pull-right" ng-click="clearTasks()"><span class="glyphicon glyphicon-trash"></span> Clear tasks</a></div>
       <div class="panel-body">
         <table class="table">
           <thead>
             <tr>
               <th>Task name</th>
               <th>Task ID</th>
               <th>Status</th>
+              <th>Elapsed time</th>
               <th>Result</th>
             </tr>
           </thead>
@@ -157,6 +183,7 @@ <h1>PySiQ server example</h1>
                 <span ng-if="['FAILED'].indexOf(task.status) > -1" class="label label-danger">{{task.status}}</span>
                 <span ng-if="['QUEUED', 'STARTED', 'FINISHED', 'FAILED'].indexOf(task.status) === -1" class="label label-default">{{task.status}}</span>
               </td>
+              <td>{{task.elapsed_time}}</td>
               <td>{{task.result}}</td>
             </tr>
           </tbody>