Schedule with providers every 20 seconds now and removed auth from IP…

…s in providers
djego · Apr 27, 2021 · a143ccb · a143ccb
1 parent c87e4ad
commit a143ccb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/cloudproxy/main.py b/cloudproxy/main.py
@@ -37,10 +37,26 @@ def get_ip_list():
     ip_list = []
     if settings.config["providers"]["digitalocean"]["ips"]:
         for ip in settings.config["providers"]["digitalocean"]["ips"]:
-            ip_list.append(ip)
+            ip_list.append(
+                "http://"
+                + settings.config["auth"]["username"]
+                + ":"
+                + settings.config["auth"]["password"]
+                + "@"
+                + ip
+                + ":8899"
+            )
     if settings.config["providers"]["aws"]["ips"]:
         for ip in settings.config["providers"]["aws"]["ips"]:
-            ip_list.append(ip)
+            ip_list.append(
+                "http://"
+                + settings.config["auth"]["username"]
+                + ":"
+                + settings.config["auth"]["password"]
+                + "@"
+                + ip
+                + ":8899"
+            )
     return ip_list
 
 

diff --git a/cloudproxy/providers/manager.py b/cloudproxy/providers/manager.py
@@ -7,42 +7,24 @@
 
 def do_manager():
     ip_list = do_start()
-    settings.config["providers"]["digitalocean"]["ips"] = [
-        "http://"
-        + settings.config["auth"]["username"]
-        + ":"
-        + settings.config["auth"]["password"]
-        + "@"
-        + ip
-        + ":8899"
-        for ip in ip_list
-    ]
+    settings.config["providers"]["digitalocean"]["ips"] = [ip for ip in ip_list]
     return ip_list
 
 
 def aws_manager():
     ip_list = aws_start()
-    settings.config["providers"]["aws"]["ips"] = [
-        "http://"
-        + settings.config["auth"]["username"]
-        + ":"
-        + settings.config["auth"]["password"]
-        + "@"
-        + ip
-        + ":8899"
-        for ip in ip_list
-    ]
+    settings.config["providers"]["aws"]["ips"] = [ip for ip in ip_list]
     return ip_list
 
 
 def init_schedule():
     sched = BackgroundScheduler()
     sched.start()
     if settings.config["providers"]["digitalocean"]["enabled"]:
-        sched.add_job(do_manager, "interval", seconds=30)
+        sched.add_job(do_manager, "interval", seconds=20)
     else:
         logger.info("DigitalOcean not enabled")
     if settings.config["providers"]["aws"]["enabled"]:
-        sched.add_job(aws_manager, "interval", seconds=30)
+        sched.add_job(aws_manager, "interval", seconds=20)
     else:
         logger.info("AWS not enabled")