X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=a1%2Frun.py;h=122684afcfe6fe669cfbf066da170263e7a22c80;hb=39c9ab62125be03194b4c433b4f9fa4617d0a65d;hp=67f63d6ca2c63851831fb1dbcaf47390bd824eb9;hpb=6b69910923309e05820706dc025e1441463906c9;p=ric-plt%2Fa1.git

diff --git a/a1/run.py b/a1/run.py
index 67f63d6..122684a 100644
--- a/a1/run.py
+++ b/a1/run.py
@@ -1,6 +1,3 @@
-"""
-A1 entrypoint
-"""
 # ==================================================================================
 #       Copyright (c) 2019 Nokia
 #       Copyright (c) 2018-2019 AT&T Intellectual Property.
@@ -17,36 +14,29 @@ A1 entrypoint
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # ==================================================================================
-import time
-from threading import Thread
+"""
+A1 entrypoint
+"""
+from os import environ
 from gevent.pywsgi import WSGIServer
-from a1 import get_module_logger, app
+from mdclogpy import Logger
+from a1 import app
 from a1 import a1rmr
 
 
-logger = get_module_logger(__name__)
-
-
-def start_rmr_thread(real_init=True):
-    """
-    Start a1s rmr thread
-    Also called during unit testing
-    """
-    rmr_loop = a1rmr.RmrLoop(real_init)
-    thread = Thread(target=rmr_loop.loop)
-    thread.start()
-    while not rmr_loop.rmr_is_ready():
-        time.sleep(0.5)
-    return rmr_loop  # return the handle; useful during unit testing
+mdc_logger = Logger(name=__name__)
 
 
 def main():
     """Entrypoint"""
+    mdc_logger.debug("A1Mediator starts")
     # start rmr thread
-    logger.debug("Initializing rmr thread. A1s webserver will not start until rmr initialization is complete.")
-    start_rmr_thread()
-
+    mdc_logger.debug("Starting RMR thread with RMR_RTG_SVC {0}, RMR_SEED_RT {1}".format(environ.get('RMR_RTG_SVC'), environ.get('RMR_SEED_RT')))
+    mdc_logger.debug("RMR initialization must complete before webserver can start")
+    a1rmr.start_rmr_thread()
+    mdc_logger.debug("RMR initialization complete")
     # start webserver
-    logger.debug("Starting gevent server")
-    http_server = WSGIServer(("", 10000), app)
+    port = 10000
+    mdc_logger.debug("Starting gevent webserver on port {0}".format(port))
+    http_server = WSGIServer(("", port), app)
     http_server.serve_forever()