fixed caddy, migration problems, added fabric use

Author: ghaemisr

.gitignore

@@ -1,2 +1,2 @@
-.\idea
+.idea
 *.pyc

ServerlessController/.gitignore

@@ -1,6 +1,7 @@
-.\idea
+.idea
 *.pyc
 settings.ini
 .env.prod.db
 .env.prod.mq
-.env.prod
+.env.prod
+caddydata*

ServerlessController/Caddyfile

@@ -1,9 +1,5 @@
-
-www.chainfaas.com, chainfaas.com {
-  proxy / 127.0.0.1:2424 {
-    transparent
-    websocket
-  }  
+www.chainfaas.sara-dev.com, chainfaas.sara-dev.com {
+  reverse_proxy http://nginx:80 
 }
 
 

ServerlessController/Caddyfile.prod

@@ -0,0 +1,5 @@
+www.chainfaas.com, chainfaas.com {
+  reverse_proxy http://nginx:80 
+}
+
+

ServerlessController/MSc_Research_Django/settings.py

@@ -117,6 +117,7 @@
 
 # Fabric config
 CONTROLLER_TOKEN = config.get('fabric', 'CONTROLLER_TOKEN')
+USE_FABRIC = False
 
 DATABASES = {
     'default': {

ServerlessController/controller_app/views.py

@@ -8,7 +8,7 @@
 from django.http import HttpResponse
 import fabric.views as fabric
 from pytz import timezone
-from MSc_Research_Django.settings import TIME_ZONE
+from MSc_Research_Django.settings import TIME_ZONE, USE_FABRIC
 
 
 def request_handler(request, service, start_time):
@@ -30,12 +30,13 @@ def request_handler(request, service, start_time):
     task = re.search(r"/docker/(.*)$", task_link).group(1)
     task_developer = service.developer.id
 
-    r = fabric.invoke_new_job(str(job.id), str(service.id), service.developer.user.username,
-                                     provider.user.username, provider.fabric_org)
-    if 'jwt expired' in r.text or 'jwt malformed' in r.text or 'User was not found' in r.text:
-        token = fabric.register_user()
+    if USE_FABRIC:
         r = fabric.invoke_new_job(str(job.id), str(service.id), service.developer.user.username,
-                                     provider.user.username, provider.fabric_org)
+                                        provider.user.username, provider.fabric_org)
+        if 'jwt expired' in r.text or 'jwt malformed' in r.text or 'User was not found' in r.text:
+            token = fabric.register_user()
+            r = fabric.invoke_new_job(str(job.id), str(service.id), service.developer.user.username,
+                                        provider.user.username, provider.fabric_org)
 
     task_dict = {'task': task, 'task_developer':task_developer, 'job':job.id}
     response = add_task_to_queue(request, task_dict, provider.user.username)
@@ -49,10 +50,11 @@ def request_handler(request, service, start_time):
     job.finished = True
     job.save()
     providing_time = int(((job.ack_time - job.start_time)/timedelta(microseconds=1))/1000) # Providing time in milliseconds
-    r = fabric.invoke_received_result(str(job.id))
-    if 'jwt expired' in r.text or 'jwt malformed' in r.text or 'User was not found' in r.text:
-        token = fabric.register_user()
+    if USE_FABRIC:
         r = fabric.invoke_received_result(str(job.id))
+        if 'jwt expired' in r.text or 'jwt malformed' in r.text or 'User was not found' in r.text:
+            token = fabric.register_user()
+            r = fabric.invoke_received_result(str(job.id))
     return response, provider.user.username, providing_time, str(job.id)
 
 

ServerlessController/developers_app/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.2.5 on 2019-10-24 16:05
+# Generated by Django 2.2.10 on 2020-05-28 16:19
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -27,4 +27,4 @@ class Migration(migrations.Migration):
                 'unique_together': {('name', 'developer')},
             },
         ),
-    ]
+    ]

ServerlessController/docker-compose.yml

@@ -1,10 +1,21 @@
 version: '3.3'
 
 services:
+  caddy:
+    image: "caddy:latest"
+    restart: always
+    volumes:
+      - ./caddydata:/data  # to save certificates on disk
+      # - ./Caddyfile:/etc/caddy/Caddyfile  # to use the Caddyfile
+      - ./Caddyfile.prod:/etc/caddy/Caddyfile  # to use the Caddyfile
+    ports:
+      - 80:80
+      - 443:443
+
   nginx:
     build: ./nginx
-    ports:
-      - 2424:80
+    expose:
+      - 80
     volumes:
       - static_volume:/home/app/web/static
     depends_on:

ServerlessController/profiles/migrations/0001_initial.py

@@ -1,8 +1,10 @@
-# Generated by Django 2.2.5 on 2019-10-24 16:05
+# Generated by Django 2.2.10 on 2020-05-28 16:19
 
+import datetime
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -20,7 +22,9 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('active', models.BooleanField(default=False)),
                 ('ready', models.BooleanField(default=False)),
+                ('last_ready_signal', models.DateTimeField(default=datetime.datetime(2018, 7, 1, 5, 18, tzinfo=utc))),
                 ('location', models.CharField(blank=True, max_length=30)),
+                ('fabric_org', models.CharField(blank=True, max_length=30)),
                 ('ram', models.IntegerField(default=0)),
                 ('cpu', models.IntegerField(default=0)),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
@@ -35,4 +39,4 @@ class Migration(migrations.Migration):
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
-    ]
+    ]