From 883d4395443969b4d40ea307af98429998126e4c Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 21 Mar 2019 14:48:51 +0100 Subject: [PATCH] add timeout field to policy to prevent stuck policies --- passbook/core/forms/policies.py | 2 +- .../core/migrations/0021_policy_timeout.py | 18 ++++++++++++++++++ passbook/core/models.py | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 passbook/core/migrations/0021_policy_timeout.py diff --git a/passbook/core/forms/policies.py b/passbook/core/forms/policies.py index f8d54a6c0..8fc1e5a38 100644 --- a/passbook/core/forms/policies.py +++ b/passbook/core/forms/policies.py @@ -7,7 +7,7 @@ from passbook.core.models import (DebugPolicy, FieldMatcherPolicy, GroupMembershipPolicy, PasswordPolicy, WebhookPolicy) -GENERAL_FIELDS = ['name', 'action', 'negate', 'order', ] +GENERAL_FIELDS = ['name', 'action', 'negate', 'order', 'timeout'] class FieldMatcherPolicyForm(forms.ModelForm): """FieldMatcherPolicy Form""" diff --git a/passbook/core/migrations/0021_policy_timeout.py b/passbook/core/migrations/0021_policy_timeout.py new file mode 100644 index 000000000..acf278b69 --- /dev/null +++ b/passbook/core/migrations/0021_policy_timeout.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.7 on 2019-03-21 12:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('passbook_core', '0020_groupmembershippolicy'), + ] + + operations = [ + migrations.AddField( + model_name='policy', + name='timeout', + field=models.IntegerField(default=30), + ), + ] diff --git a/passbook/core/models.py b/passbook/core/models.py index 41ab18e3d..0a09a1311 100644 --- a/passbook/core/models.py +++ b/passbook/core/models.py @@ -220,6 +220,7 @@ class Policy(UUIDModel, CreatedUpdatedModel): action = models.CharField(max_length=20, choices=ACTIONS) negate = models.BooleanField(default=False) order = models.IntegerField(default=0) + timeout = models.IntegerField(default=30) objects = InheritanceManager()