From 1984a242d09e5d3f9401e7369ae2c71f37dc4c31 Mon Sep 17 00:00:00 2001 From: pablohashescobar Date: Wed, 6 Dec 2023 19:19:42 +0530 Subject: [PATCH] dev: remove license engine communication --- apiserver/plane/celery.py | 4 -- .../management/commands/register_instance.py | 60 +++++-------------- apiserver/plane/settings/common.py | 1 - 3 files changed, 14 insertions(+), 51 deletions(-) diff --git a/apiserver/plane/celery.py b/apiserver/plane/celery.py index eb90c6205..442e72836 100644 --- a/apiserver/plane/celery.py +++ b/apiserver/plane/celery.py @@ -28,10 +28,6 @@ app.conf.beat_schedule = { "task": "plane.bgtasks.file_asset_task.delete_file_asset", "schedule": crontab(hour=0, minute=0), }, - "check-instance-verification": { - "task": "plane.license.bgtasks.instance_verification_task.instance_verification_task", - "schedule": crontab(minute=0, hour='*/4'), - }, } # Load task modules from all registered Django app configs. diff --git a/apiserver/plane/license/management/commands/register_instance.py b/apiserver/plane/license/management/commands/register_instance.py index 9d467b9dd..e6cfa7167 100644 --- a/apiserver/plane/license/management/commands/register_instance.py +++ b/apiserver/plane/license/management/commands/register_instance.py @@ -30,13 +30,11 @@ class Command(BaseCommand): # Load JSON content from the file data = json.load(file) - machine_signature = options.get("machine_signature", False) + machine_signature = options.get("machine_signature", "machine-signature") if not machine_signature: raise CommandError("Machine signature is required") - # Check if machine is online - headers = {"Content-Type": "application/json"} payload = { "instance_key": settings.INSTANCE_KEY, "version": data.get("version", 0.1), @@ -44,51 +42,21 @@ class Command(BaseCommand): "user_count": User.objects.filter(is_bot=False).count(), } - try: - response = requests.post( - f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/", - headers=headers, - data=json.dumps(payload), - timeout=30 - ) + instance = Instance.objects.create( + instance_name="Plane Free", + instance_id=secrets.token_hex(12), + license_key=None, + api_key=secrets.token_hex(8), + version=payload.get("version"), + last_checked_at=timezone.now(), + user_count=payload.get("user_count", 0), + ) - if response.status_code == 201: - data = response.json() - # Create instance - instance = Instance.objects.create( - instance_name="Plane Free", - instance_id=data.get("id"), - license_key=data.get("license_key"), - api_key=data.get("api_key"), - version=data.get("version"), - last_checked_at=timezone.now(), - user_count=data.get("user_count", 0), - is_verified=True, - ) - - self.stdout.write( - self.style.SUCCESS( - f"Instance successfully registered and verified" - ) - ) - return - except requests.RequestException as _e: - instance = Instance.objects.create( - instance_name="Plane Free", - instance_id=secrets.token_hex(12), - license_key=None, - api_key=secrets.token_hex(8), - version=payload.get("version"), - last_checked_at=timezone.now(), - user_count=payload.get("user_count", 0), + self.stdout.write( + self.style.SUCCESS( + f"Instance registered" ) - self.stdout.write( - self.style.SUCCESS( - f"Instance successfully registered" - ) - ) - return - raise CommandError("Instance could not be registered") + ) else: self.stdout.write( self.style.SUCCESS( diff --git a/apiserver/plane/settings/common.py b/apiserver/plane/settings/common.py index 8ac7090d7..002c2accb 100644 --- a/apiserver/plane/settings/common.py +++ b/apiserver/plane/settings/common.py @@ -287,7 +287,6 @@ CELERY_IMPORTS = ( "plane.bgtasks.issue_automation_task", "plane.bgtasks.exporter_expired_task", "plane.bgtasks.file_asset_task", - "plane.license.bgtasks.instance_verification_task", ) # Sentry Settings