From 889e16a77517549fb833a90d047455533be02f06 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Sun, 28 Mar 2021 16:24:33 -0500
Subject: http-api: T3440: give uvicorn time to initialize before starting
 Nginx

---
 src/conf_mode/http-api.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/conf_mode/http-api.py')

diff --git a/src/conf_mode/http-api.py b/src/conf_mode/http-api.py
index 472eb77e4..7e4b117c8 100755
--- a/src/conf_mode/http-api.py
+++ b/src/conf_mode/http-api.py
@@ -19,6 +19,7 @@
 import sys
 import os
 import json
+import time
 from copy import deepcopy
 
 import vyos.defaults
@@ -34,11 +35,6 @@ config_file = '/etc/vyos/http-api.conf'
 
 vyos_conf_scripts_dir=vyos.defaults.directories['conf_mode']
 
-# XXX: this model will need to be extended for tag nodes
-dependencies = [
-    'https.py',
-]
-
 def get_config(config=None):
     http_api = deepcopy(vyos.defaults.api_data)
     x = http_api.get('api_keys')
@@ -103,8 +99,10 @@ def apply(http_api):
     else:
         call('systemctl stop vyos-http-api.service')
 
-    for dep in dependencies:
-        cmd(f'{vyos_conf_scripts_dir}/{dep}', raising=ConfigError)
+    # Let uvicorn settle before restarting Nginx
+    time.sleep(2)
+
+    cmd(f'{vyos_conf_scripts_dir}/https.py', raising=ConfigError)
 
 if __name__ == '__main__':
     try:
-- 
cgit v1.2.3