Merge branch '9-logging-setup'

core/configure.sh

 #!/bin/bash
-echo "Running configure.sh"
-
-# Configure instance
-sed -e "s/'disable_existing_loggers': True,/'disable_existing_loggers': False,/" -i pvs_instance/settings.py
-HANDLERS="'handlers': {\n
-    'null': {\n
-        'level':'DEBUG',\n
-        'class':'logging.NullHandler',\n
-    },\n
-    'console': {\n
-        'level': 'DEBUG' if DEBUG else 'INFO',\n
-        'class': 'logging.StreamHandler',\n
-        'formatter': 'verbose' if DEBUG else 'simple',\n
-        'filters': [],\n
-    },\n
-},"
-LOGGERS="'loggers': {\n
-    'eoxserver': {\n
-        'handlers': ['console'],\n
-        'level': 'DEBUG' if DEBUG else 'INFO',\n
-        'propagate': False,\n
-    },
-}"
-sed -e "/^    'handlers': {$/,/^    },$/c `echo ${HANDLERS}`" -i pvs_instance/settings.py
-sed -e "/^    'loggers': {$/,/^    }$/c `echo ${LOGGERS}`" -i pvs_instance/settings.py
-
-sed -e "s,http_service_url=http://localhost:8000/ows,http_service_url=${APACHE_ALIAS}/ows," -i pvs_instance/conf/eoxserver.conf
-sed -e "s/resampling_method=average/resampling_method=near/" -i pvs_instance/conf/eoxserver.conf
-# TODO maxsize...
-
-echo "EOXS_VALIDATE_IDS_NCNAME = False" >> pvs_instance/settings.py
-echo "EOXS_OPENSEARCH_RECORD_MODEL = 'eoxserver.resources.coverages.models.Product'" >> pvs_instance/settings.py
-
-echo "CACHES = {
-'default': {
-    'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-    'LOCATION': '/var/tmp/django_cache',
-}
-}" >> pvs_instance/settings.py
-
-sed -e "/TEMPLATE_DEBUG = DEBUG/d" -i pvs_instance/settings.py
-
-sed -e 's/DEBUG = True/DEBUG = False/' -i pvs_instance/settings.py
-
-# Further configuration
-echo "ALLOWED_HOSTS = ['*']" >> pvs_instance/settings.py
-echo "USE_X_FORWARDED_HOST = True" >> pvs_instance/settings.py
-echo "SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')" >> pvs_instance/settings.py
-
-chmod g+w -R .
-chgrp users -R .
\ No newline at end of file
+{
+    echo "Running configure.sh"
+
+    # Configure instance
+    sed -e "s/'disable_existing_loggers': True,/'disable_existing_loggers': False,/" -i pvs_instance/settings.py
+    HANDLERS="'handlers': {\n
+        'null': {\n
+            'level':'DEBUG',\n
+            'class':'logging.NullHandler',\n
+        },\n
+        'console': {\n
+            'level': 'DEBUG' if DEBUG else 'INFO',\n
+            'class': 'logging.StreamHandler',\n
+            'formatter': 'verbose' if DEBUG else 'simple',\n
+            'filters': [],\n
+        },\n
+    },"
+    LOGGERS="'loggers': {\n
+        'eoxserver': {\n
+            'handlers': ['console'],\n
+            'level': 'DEBUG' if DEBUG else 'INFO',\n
+            'propagate': False,\n
+        },
+    }"
+    sed -e "/^    'handlers': {$/,/^    },$/c `echo ${HANDLERS}`" -i pvs_instance/settings.py
+    sed -e "/^    'loggers': {$/,/^    }$/c `echo ${LOGGERS}`" -i pvs_instance/settings.py
+
+    sed -e "s,http_service_url=http://localhost:8000/ows,http_service_url=${APACHE_ALIAS}/ows," -i pvs_instance/conf/eoxserver.conf
+    sed -e "s/resampling_method=average/resampling_method=near/" -i pvs_instance/conf/eoxserver.conf
+    # TODO maxsize...
+
+    echo "EOXS_VALIDATE_IDS_NCNAME = False" >> pvs_instance/settings.py
+    echo "EOXS_OPENSEARCH_RECORD_MODEL = 'eoxserver.resources.coverages.models.Product'" >> pvs_instance/settings.py
+
+    echo "CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+        'LOCATION': '/var/tmp/django_cache',
+    }
+    }" >> pvs_instance/settings.py
+
+    sed -e "/TEMPLATE_DEBUG = DEBUG/d" -i pvs_instance/settings.py
+
+    sed -e 's/DEBUG = True/DEBUG = False/' -i pvs_instance/settings.py
+
+    # Further configuration
+    echo "ALLOWED_HOSTS = ['*']" >> pvs_instance/settings.py
+    echo "USE_X_FORWARDED_HOST = True" >> pvs_instance/settings.py
+    echo "SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')" >> pvs_instance/settings.py
+
+    chmod g+w -R .
+    chgrp users -R .
+} 1> &2
\ No newline at end of file

core/entrypoint.sh

@@ -5,7 +5,7 @@ TIMEOUT=${WAIT_TIMEOUT:='15'}
 
 if [[ ! -z $SERVICES ]] ; then
     for service in $SERVICES ; do
-        wait-for-it -t $TIMEOUT $service
+        wait-for-it -t $TIMEOUT $service > &2
     done
 fi
 

core/initialized.sh

 #!/bin/bash -e
 
 touch "${INSTANCE_DIR}/.initialized"
-echo "Instance ${INSTANCE_ID} is initialized"
+echo "Instance ${INSTANCE_ID} is initialized" > &2

core/run-httpd.sh

@@ -2,4 +2,4 @@
 
 
 echo "Running gunicorn"
-exec gunicorn --chdir ${INSTALL_DIR}/pvs_instance/ --bind :80 pvs_instance.wsgi:application --workers 8 --max-requests 10 --max-requests-jitter 3 --worker-class sync --timeout 120 --access-logfile - --error-logfile - --log-level warning --disable-redirect-access-to-syslog
+exec gunicorn --chdir ${INSTALL_DIR}/pvs_instance/ --bind :80 pvs_instance.wsgi:application --workers 8 --max-requests 10 --max-requests-jitter 3 --worker-class sync --timeout 120 --access-logfile - --error-logfile - --log-level warning --disable-redirect-access-to-syslog 2> &1

core/run-registrar.sh

 #!/bin/sh
 
-echo "Running registrar"
+echo "Running registrar" > &2
 
-python3 /registrar.py --mode redis --redis-host ${REDIS_HOST} --redis-port ${REDIS_PORT} --redis-register-queue-key ${REDIS_REGISTER_QUEUE_KEY} --redis-registered-set-key ${REDIS_REGISTERED_SET_KEY}
+python3 /registrar.py --mode redis --redis-host ${REDIS_HOST} --redis-port ${REDIS_PORT} --redis-register-queue-key ${REDIS_REGISTER_QUEUE_KEY} --redis-registered-set-key ${REDIS_REGISTERED_SET_KEY} > &2

core/wait-initialized.sh

 #!/bin/bash -e
 
 until [ -f "${INSTANCE_DIR}/.initialized" ] ; do
-    echo "Waiting until instance ${INSTANCE_ID} is initialized"
+    echo "Waiting until instance ${INSTANCE_ID} is initialized" > &2
     sleep 3
     # TODO: timeout?
 done