Wrap up other places where the old license access method is used

This commit is contained in:
Matthew Jones 2016-01-25 20:58:49 -05:00
parent 296ca52b0f
commit 769fe18724
3 changed files with 3 additions and 3 deletions

View File

@ -28,7 +28,7 @@ class Command(BaseCommand):
def handle(self, *args, **kwargs):
# Get the license data.
license_reader = TaskSerializer()
license_data = license_reader.from_file()
license_data = license_reader.from_database()
# Does the license have features, at all?
# If there is no license yet, then all features are clearly off.

View File

@ -148,7 +148,7 @@ class BaseAccess(object):
def check_license(self, add_host=False, feature=None, check_expiration=True):
reader = TaskSerializer()
validation_info = reader.from_file()
validation_info = reader.from_database()
if ('test' in sys.argv or 'jenkins' in sys.argv) and not os.environ.get('SKIP_LICENSE_FIXUP_FOR_TEST', ''):
validation_info['free_instances'] = 99999999
validation_info['time_remaining'] = 99999999

View File

@ -1180,7 +1180,7 @@ class Command(NoArgsCommand):
def check_license(self):
reader = LicenseReader()
license_info = reader.from_file()
license_info = reader.from_database()
if not license_info or len(license_info) == 0:
self.logger.error(LICENSE_NON_EXISTANT_MESSAGE)
raise CommandError('No Tower license found!')