From 15931419320a17250bfe3a65aa9e0da99bdeed03 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Thu, 8 Jan 2026 11:30:47 -0300 Subject: [PATCH] remove stats_sync_interval and stats_cache_interval from ClusterSettings model --- cluster/forms.py | 20 +----------------- ...rsettings_stats_cache_interval_and_more.py | 21 +++++++++++++++++++ cluster/models.py | 2 -- 3 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 cluster/migrations/0014_remove_clustersettings_stats_cache_interval_and_more.py diff --git a/cluster/forms.py b/cluster/forms.py index 088193b..3afc4b1 100644 --- a/cluster/forms.py +++ b/cluster/forms.py @@ -89,17 +89,12 @@ class WorkerForm(forms.ModelForm): class ClusterSettingsForm(forms.ModelForm): class Meta: model = ClusterSettings - fields = [ - 'enabled', 'primary_enable_wireguard', 'stats_sync_interval', - 'stats_cache_interval', 'cluster_mode', 'restart_mode', 'worker_display' - ] + fields = ['enabled', 'primary_enable_wireguard', 'cluster_mode', 'restart_mode', 'worker_display'] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.fields['enabled'].label = _("Cluster Enabled") self.fields['primary_enable_wireguard'].label = _("Primary Enable WireGuard") - self.fields['stats_sync_interval'].label = _("Stats Sync Interval (seconds)") - self.fields['stats_cache_interval'].label = _("Stats Cache Interval (seconds)") self.fields['cluster_mode'].label = _("Cluster Mode") self.fields['restart_mode'].label = _("Restart Mode") self.fields['worker_display'].label = _("Worker Display") @@ -114,11 +109,6 @@ class ClusterSettingsForm(forms.ModelForm): Column('primary_enable_wireguard', css_class='form-group col-md-6 mb-0'), css_class='form-row' ), - Row( - Column('stats_sync_interval', css_class='form-group col-md-6 mb-0'), - Column('stats_cache_interval', css_class='form-group col-md-6 mb-0'), - css_class='form-row' - ), Row( Column('cluster_mode', css_class='form-group col-md-6 mb-0'), Column('restart_mode', css_class='form-group col-md-6 mb-0'), @@ -139,16 +129,8 @@ class ClusterSettingsForm(forms.ModelForm): def clean(self): cleaned_data = super().clean() - stats_sync_interval = cleaned_data.get('stats_sync_interval') - stats_cache_interval = cleaned_data.get('stats_cache_interval') primary_enable_wireguard = cleaned_data.get('primary_enable_wireguard') - if stats_sync_interval and stats_sync_interval < 60: - raise ValidationError(_("Stats sync interval must be at least 60 seconds.")) - - if stats_cache_interval and stats_cache_interval < 60: - raise ValidationError(_("Stats cache interval must be at least 60 seconds.")) - if not primary_enable_wireguard: raise ValidationError(_("Disabling WireGuard on the master server is currently not supported.")) diff --git a/cluster/migrations/0014_remove_clustersettings_stats_cache_interval_and_more.py b/cluster/migrations/0014_remove_clustersettings_stats_cache_interval_and_more.py new file mode 100644 index 0000000..eed0502 --- /dev/null +++ b/cluster/migrations/0014_remove_clustersettings_stats_cache_interval_and_more.py @@ -0,0 +1,21 @@ +# Generated by Django 5.2.9 on 2026-01-08 14:15 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cluster', '0013_alter_clustersettings_restart_mode_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='clustersettings', + name='stats_cache_interval', + ), + migrations.RemoveField( + model_name='clustersettings', + name='stats_sync_interval', + ), + ] diff --git a/cluster/models.py b/cluster/models.py index 48a3895..1959c39 100644 --- a/cluster/models.py +++ b/cluster/models.py @@ -8,8 +8,6 @@ class ClusterSettings(models.Model): name = models.CharField(default='cluster_settings', max_length=16, unique=True) enabled = models.BooleanField(default=False) primary_enable_wireguard = models.BooleanField(default=True) - stats_sync_interval = models.IntegerField(default=60) - stats_cache_interval = models.IntegerField(default=60) cluster_mode = models.CharField(default='mirror', max_length=16, choices=(('mirror', 'Mirror'), )) restart_mode = models.CharField(default='auto', max_length=16, choices=(('auto', 'Automatic restart'),)) worker_display = models.CharField(