rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Save datasync config with new keys, per RattailConfiguration

Browse source
This commit is contained in:
Lance Edgar 2023-06-01 11:12:31 -05:00
parent b4816c6289
commit fd2b290fd0
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tailbone/views/datasync.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2022 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,13 +24,10 @@
DataSync Views DataSync Views
""" """
from __future__ import unicode_literals, absolute_import
import json import json
import subprocess import subprocess
import logging import logging
import six
import sqlalchemy as sa import sqlalchemy as sa
from rattail.db import model from rattail.db import model
@ -117,7 +114,7 @@ class DataSyncThreadView(MasterView):
watcher_data = [] watcher_data = []
consumer_data = [] consumer_data = []
now = app.localtime() now = app.localtime()
for key, profile in six.iteritems(profiles): for key, profile in profiles.items():
watcher = profile.watcher watcher = profile.watcher
lastrun = self.datasync_handler.get_watcher_lastrun( lastrun = self.datasync_handler.get_watcher_lastrun(
@ -258,7 +255,7 @@ class DataSyncThreadView(MasterView):
watch.append(pkey) watch.append(pkey)
settings.extend([ settings.extend([
{'name': 'rattail.datasync.{}.watcher'.format(pkey), {'name': 'rattail.datasync.{}.watcher.spec'.format(pkey),
'value': profile['watcher_spec']}, 'value': profile['watcher_spec']},
{'name': 'rattail.datasync.{}.watcher.db'.format(pkey), {'name': 'rattail.datasync.{}.watcher.db'.format(pkey),
'value': profile['watcher_dbkey']}, 'value': profile['watcher_dbkey']},
@ -289,7 +286,7 @@ class DataSyncThreadView(MasterView):
if consumer['enabled']: if consumer['enabled']:
consumers.append(ckey) consumers.append(ckey)
settings.extend([ settings.extend([
{'name': 'rattail.datasync.{}.consumer.{}'.format(pkey, ckey), {'name': 'rattail.datasync.{}.consumer.spec.{}'.format(pkey, ckey),
'value': consumer['consumer_spec']}, 'value': consumer['consumer_spec']},
{'name': 'rattail.datasync.{}.consumer.{}.db'.format(pkey, ckey), {'name': 'rattail.datasync.{}.consumer.{}.db'.format(pkey, ckey),
'value': consumer['consumer_dbkey']}, 'value': consumer['consumer_dbkey']},
@ -304,7 +301,7 @@ class DataSyncThreadView(MasterView):
]) ])
settings.extend([ settings.extend([
{'name': 'rattail.datasync.{}.consumers'.format(pkey), {'name': 'rattail.datasync.{}.consumers.list'.format(pkey),
'value': ', '.join(consumers)}, 'value': ', '.join(consumers)},
]) ])