From 73407e245f130c27192122a7b50256005d757091 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 30 May 2021 00:18:04 -0400
Subject: [PATCH] Move startup code to an entrypoint function

Prevents further issues with startup.
---
 api-daemon/pvcapid.py        |  2 ++
 api-daemon/pvcapid/Daemon.py | 49 ++++++++++++++++++------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/api-daemon/pvcapid.py b/api-daemon/pvcapid.py
index 3e2f7b96..537bdc31 100755
--- a/api-daemon/pvcapid.py
+++ b/api-daemon/pvcapid.py
@@ -20,3 +20,5 @@
 ###############################################################################
 
 import pvcapid.Daemon  # noqa: F401
+
+pvcapid.Daemon.entrypoint()
diff --git a/api-daemon/pvcapid/Daemon.py b/api-daemon/pvcapid/Daemon.py
index cd65efd5..f663cf9e 100755
--- a/api-daemon/pvcapid/Daemon.py
+++ b/api-daemon/pvcapid/Daemon.py
@@ -107,30 +107,31 @@ except Exception as e:
 # Entrypoint
 ##########################################################
 
-import pvcapid.flaskapi as pvc_api  # noqa: E402
+def entrypoint():
+    import pvcapid.flaskapi as pvc_api  # noqa: E402
 
-if config['ssl_enabled']:
-    context = (config['ssl_cert_file'], config['ssl_key_file'])
-else:
-    context = None
+    if config['ssl_enabled']:
+        context = (config['ssl_cert_file'], config['ssl_key_file'])
+    else:
+        context = None
 
-# Print our startup messages
-print('')
-print('|--------------------------------------------------|')
-print('|           ########  ##     ##  ######            |')
-print('|           ##     ## ##     ## ##    ##           |')
-print('|           ##     ## ##     ## ##                 |')
-print('|           ########  ##     ## ##                 |')
-print('|           ##         ##   ##  ##                 |')
-print('|           ##          ## ##   ##    ##           |')
-print('|           ##           ###     ######            |')
-print('|--------------------------------------------------|')
-print('| Parallel Virtual Cluster API daemon v{0: <11} |'.format(version))
-print('| API version: v{0: <34} |'.format(API_VERSION))
-print('| Listen: {0: <40} |'.format('{}:{}'.format(config['listen_address'], config['listen_port'])))
-print('| SSL: {0: <43} |'.format(str(config['ssl_enabled'])))
-print('| Authentication: {0: <32} |'.format(str(config['auth_enabled'])))
-print('|--------------------------------------------------|')
-print('')
+    # Print our startup messages
+    print('')
+    print('|--------------------------------------------------|')
+    print('|           ########  ##     ##  ######            |')
+    print('|           ##     ## ##     ## ##    ##           |')
+    print('|           ##     ## ##     ## ##                 |')
+    print('|           ########  ##     ## ##                 |')
+    print('|           ##         ##   ##  ##                 |')
+    print('|           ##          ## ##   ##    ##           |')
+    print('|           ##           ###     ######            |')
+    print('|--------------------------------------------------|')
+    print('| Parallel Virtual Cluster API daemon v{0: <11} |'.format(version))
+    print('| API version: v{0: <34} |'.format(API_VERSION))
+    print('| Listen: {0: <40} |'.format('{}:{}'.format(config['listen_address'], config['listen_port'])))
+    print('| SSL: {0: <43} |'.format(str(config['ssl_enabled'])))
+    print('| Authentication: {0: <32} |'.format(str(config['auth_enabled'])))
+    print('|--------------------------------------------------|')
+    print('')
 
-pvc_api.app.run(config['listen_address'], config['listen_port'], threaded=True, ssl_context=context)
+    pvc_api.app.run(config['listen_address'], config['listen_port'], threaded=True, ssl_context=context)