External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 05:59:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

rename scheduler config singleton

Browse Source
This commit is contained in:
Chris Meyers
2016-11-01 14:07:00 -05:00
parent e1a84f4c85
commit 25b85c4a0b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0047_v310_tower_state.py
View File

@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='TowerState', name='TowerScheduleState',
fields=[ fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('schedule_last_run', models.DateTimeField(auto_now_add=True)), ('schedule_last_run', models.DateTimeField(auto_now_add=True)),

4
awx/main/models/ha.py
View File

@@ -13,7 +13,7 @@ from awx.main.models.jobs import Job
from awx.main.models.projects import ProjectUpdate from awx.main.models.projects import ProjectUpdate
from awx.main.models.unified_jobs import UnifiedJob from awx.main.models.unified_jobs import UnifiedJob
__all__ = ('Instance', 'JobOrigin', 'TowerState',) __all__ = ('Instance', 'JobOrigin', 'TowerScheduleState',)
class Instance(models.Model): class Instance(models.Model):
@@ -35,7 +35,7 @@ class Instance(models.Model):
# NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing # NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing
return "tower" return "tower"
class TowerState(SingletonModel): class TowerScheduleState(SingletonModel):
schedule_last_run = models.DateTimeField(auto_now_add=True) schedule_last_run = models.DateTimeField(auto_now_add=True)
class JobOrigin(models.Model): class JobOrigin(models.Model):

2
awx/main/tasks.py
View File

@@ -137,7 +137,7 @@ def cluster_node_heartbeat(self):
@task(bind=True, queue='default') @task(bind=True, queue='default')
def tower_periodic_scheduler(self): def tower_periodic_scheduler(self):
run_now = now() run_now = now()
state = TowerState.get_solo() state = TowerScheduleState.get_solo()
last_run = state.schedule_last_run last_run = state.schedule_last_run
logger.debug("Last run was: %s", last_run) logger.debug("Last run was: %s", last_run)
state.schedule_last_run = run_now state.schedule_last_run = run_now