logging of initialization

Author: pinzon

.gitignore

@@ -1,2 +1,3 @@
 .venv
+nosetests.xml
 __pycache__

Makefile

@@ -18,4 +18,4 @@ install-venv:
 		test ! -e requirements.txt || ($(VENV_RUN); $(PIP_CMD) -q install -r requirements.txt)
 
 test:
-	($(VENV_RUN); DEBUG=$(DEBUG) PYTHONPATH=`pwd` nosetests $(NOSE_ARGS) --with-timer --with-coverage --logging-level=$(NOSE_LOG_LEVEL) --nocapture --no-skip --exe --cover-erase --cover-tests --cover-inclusive --cover-package=localstack --with-xunit --exclude='$(VENV_DIR).*' --ignore-files='lambda_python3.py' $(TEST_PATH))
+	($(VENV_RUN); DEBUG=$(DEBUG) PYTHONPATH=`pwd` nosetests $(NOSE_ARGS) --with-timer --logging-level=$(NOSE_LOG_LEVEL) --nocapture --no-skip --exe --cover-erase --cover-tests --cover-inclusive --cover-package=localstack --with-xunit --exclude='$(VENV_DIR).*' --ignore-files='lambda_python3.py' $(TEST_PATH))

common_utils.py

@@ -16,8 +16,7 @@
 # DEFAULT_PORT_PATTERN = re.compile("'(\\w+)'\\Q: '{proto}://{host}:\\E(\\d+)'")
 
 localstack_instance = None
-LOG = logging.getLogger(__name__);
-
+logging.basicConfig(level=logging.INFO, format='%(message)s')
 
 class Localstack:
 
@@ -61,21 +60,17 @@ def startup(self, docker_configuration) :
                 raise "Unable to start docker"
 
         except:
-            error = sys.exc_info()
-            print(error)
+            raise sys.exc_info()
+
 
     def stop(self):
-        try:
-            self.localstack_container.stop()
-        except:
-            error = sys.exc_info()
-            print(error)
+        self.localstack_container.stop()
+
 
     def setup_logger(self):
         localstack_logger = LocalstackLogger(self.localstack_container)
         localstack_logger.start()
 
-    # @param services 
 def startup_localstack(port=4566, services=[], ignore_docker_errors = False):
     global localstack_instance
     localstack_instance = Localstack.INSTANCE()
@@ -85,7 +80,6 @@ def startup_localstack(port=4566, services=[], ignore_docker_errors = False):
         config.envirement_variables.update({'SERVICES': ','.join(services)})
     if port != 4566:
         config.port_edge = str(port)
-    
     config.ignore_docker_runerrors = ignore_docker_errors
 
     localstack_instance.startup(config)

localstack.py

@@ -20,7 +20,6 @@
 DEFAULT_CONTAINER_ID = "localstack_main"
 
 DOCKER_CLIENT = docker.from_env()
-LOG = logging.getLogger(__name__);
 
 class Container:
 
@@ -36,7 +35,7 @@ def create_localstack_container(external_hostname, pull_new_image, randomize_por
         fullPortEdge = {(LOCALSTACK_PORT_EDGE if port_edge == None else port_edge) : (LOCALSTACK_PORT_EDGE)}
 
         if pull_new_image or not image_exists:
-            LOG.info("Pulling latest image")
+            logging.info("Pulling latest image")
             DOCKER_CLIENT.images.pull(image_name_or_default, image_tag)
 
         return DOCKER_CLIENT.containers.run(image_name_or_default, ports=fullPortEdge, environment=environment_variables, detach=True)

localstack_docker/container.py

@@ -1,22 +1,19 @@
 import threading
 import logging
 
-LOG = logging.getLogger(__name__);
-
 class LocalstackLogger():
     stream = None
+    log_thread = None
     def __init__(self, localsack_container) -> None:
-        stream = localsack_container.logs(stream=True, follow=True)    
-
+        self.stream = localsack_container.logs(stream=True, follow=True)    
 
     def start(self):
-        log_thread = threading.Thread(target=log_stream,args=[self.stream])
+        self.log_thread = threading.Thread(target=log_stream,args=[self.stream]).start()
 
 def log_stream(stream):
     try:
-        print("starting logs")
         while True:
-            line = next(stream).decode("utf-8")
-            LOG.warning(line)
+            line = next(stream).decode("utf-8").replace("\n",'')
+            logging.info(line)
     except StopIteration:
-        print("LOGS ENDED")    
+        pass

localstack_docker/localstack_logger.py

@@ -2,6 +2,7 @@
 import boto3
 import unittest
 from localstack import startup_localstack, stop_localstack
+
 class kinesis_test(unittest.TestCase):
         def setUp(self):
             startup_localstack()
@@ -19,7 +20,7 @@ def test_create_stream(self):
                 endpoint_url='http://localhost:4566')
 
             kinesis.create_stream(StreamName='test', ShardCount=1)
-            time.sleep(10)
+            time.sleep(5)
 
             response = kinesis.list_streams()
             self.assertGreater(len(response.get('StreamNames', [])),0)