4.7.8

- added support for task PID, so it can be killed in future releases
- now a task instance can be filtered by status on the admin section

Author: Jesrat

process/__init__.py

@@ -1,7 +1,7 @@
 __title__ = 'django-process'
 __description__ = 'An app for create process workflows and schedule tasks on django'
 __url__ = 'https://github.com/Jesrat/django-process'
-__version__ = '4.7.7'
+__version__ = '4.7.8'
 __author__ = 'Josue Gomez'
 __author_email__ = 'jgomez@jesrat.com'
 __license__ = 'Apache 2.0'

process/admin.py

@@ -101,6 +101,7 @@ def cancel(self, request, queryset):
 @admin.register(JobTask)
 class JobTaskAdmin(admin.ModelAdmin):
     form = JobTaskForm
+    list_filter = ('status',)
     list_display = ('__str__', 'dt_start', 'dt_end', 'observations')
 
     def get_readonly_fields(self, request, obj=None):

process/management/commands/_task.py

@@ -44,8 +44,14 @@ def run(self):
 
                 logger.info(f'command to execute {cmd}')
 
+                # executing the task and save the PID
                 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                self.obj.pid = p.pid
+                self.obj.save()
+
+                # communicate to PID to get the standard output and error
                 stdout, stderr = p.communicate()
+
                 # return code must be 0 for success
                 self.obj.observations = stdout.decode('utf-8')
                 if p.returncode:

process/management/commands/run_jobs.py

@@ -11,6 +11,7 @@
 class Command(BaseCommand):
     help = 'Run All Jobs'
 
+    # noinspection PyMethodMayBeStatic
     def handle(self, *args, **options):
         logger.info('django-process run_jobs started')
         configure_env()

process/models.py

@@ -271,7 +271,7 @@ def create(cls, process, *args, **kwargs):
         """
         this method creates a job-process instance and all its tasks, however if the job its created as finished it will
         not create any task, example the time has come for start a job but a previous instance is still running and the
-        process its configured for not overlap the new instance will be created as finished
+        process it's configured for not overlap the new instance will be created as finished
         """
         job = cls(process=process, *args, **kwargs)
         job.save()
@@ -297,7 +297,7 @@ def cancel(self):
 # noinspection SpellCheckingInspection
 class JobTask(models.Model):
     """
-    A JobTask its an instance of a Task that has been executed ant its related to the Job Instance
+    A JobTask is an instance of a Task that has been executed ant it is related to the Job Instance
     """
     initialized = 'initialized'
     awaiting = 'awaiting'
@@ -350,6 +350,7 @@ class JobTask(models.Model):
         related_name='logs'
     )
     status = models.CharField(_("status"), db_index=True, max_length=20, choices=status_choices, default=awaiting)
+    pid = models.PositiveIntegerField(_("pid"), default=0)
     dt_created = models.DateTimeField(_("created date"), blank=True, null=True, auto_now_add=True)
     dt_start = models.DateTimeField(_("start date"), blank=True, null=True)
     dt_end = models.DateTimeField(_("end date"), blank=True, null=True)