1
0
mirror of https://github.com/dkmstr/openuds.git synced 2025-03-21 10:50:26 +03:00

Merge remote-tracking branch 'origin/v3.6'

This commit is contained in:
Adolfo Gómez García 2022-11-02 21:58:04 +01:00
commit 8d0a3a7405
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
2 changed files with 4 additions and 4 deletions

View File

@ -42,7 +42,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='statscounters',
name='interval_type',
field=models.SmallIntegerField(db_index=True, default=uds.models.stats_counters.StatsCounters.CounterIntervalType['NONE']),
field=models.SmallIntegerField(db_index=True, default=uds.models.stats_counters.StatsCounters.IntervalType['NONE']),
),
migrations.RemoveIndex(
model_name='statscounters',

View File

@ -49,7 +49,7 @@ class StatsCounters(models.Model):
"""
# Valid intervals types for counters data
class CounterIntervalType(enum.IntEnum):
class IntervalType(enum.IntEnum):
NONE = 0
MINUTE = 1
HOUR = 2
@ -61,7 +61,7 @@ class StatsCounters(models.Model):
counter_type = models.SmallIntegerField(db_index=True, default=0)
stamp = models.IntegerField(db_index=True, default=0)
interval_type = models.SmallIntegerField(
db_index=True, default=CounterIntervalType.NONE
db_index=True, default=IntervalType.NONE
)
value = models.IntegerField(db_index=True, default=0)
@ -90,7 +90,7 @@ class StatsCounters(models.Model):
owner_type__in=owner_type,
counter_type=counter_type,
interval_type=kwargs.get(
'interval_type', StatsCounters.CounterIntervalType.NONE
'interval_type', StatsCounters.IntervalType.NONE
),
)