Fix docker run codepath

Author: c-w

README.md

@@ -20,9 +20,10 @@ docker run \
   -t featureservice
 ```
 
-The first time that you run this command, it will take a while as your Postgres
-on Azure instance is getting populated with over 2GB of global geo-spatial
-features.
+The first time that you run this command, it will take about 90 minutes while
+your Postgres on Azure instance is getting populated with over 2GB of global
+geo-spatial features and appropriate indices are being built. On subsequent
+runs, the start should be instantaneous.
 
 After starting the service, you will be able to call the featureService, for
 example via the following requests:

docker-entrypoint.sh

@@ -7,7 +7,7 @@ run_sql() {
     --username="${FEATURES_DB_USER}" \
     --port="${FEATURES_DB_PORT}" \
     --host="${FEATURES_DB_HOST}" \
-    --dbname="$1" \
+    --dbname="$1"
 }
 
 load_features_dump() {
@@ -41,6 +41,9 @@ if [ -z "${FEATURES_DB_USER}" ]; then fail "Need to provide FEATURES_DB_USER env
 if [ -z "${FEATURES_DB_PASSWORD}" ]; then fail "Need to provide FEATURES_DB_PASSWORD environment variable"; fi
 if [ -z "${FEATURES_DB_HOST}" ]; then fail "Need to provide FEATURES_DB_HOST environment variable"; fi
 
+username="${FEATURES_DB_USER%@*}"
+hostname="${FEATURES_DB_USER#*@}"
+
 if ! features_database_exists; then
   dump_file="/tmp/db.fc.gz"
 
@@ -50,8 +53,8 @@ if ! features_database_exists; then
   echo "CREATE USER frontend WITH login password 'changeme';" | run_sql 'postgres'
   echo "ALTER USER ops WITH password '${FEATURES_DB_PASSWORD}';" | run_sql 'postgres'
   echo "ALTER USER frontend WITH password '${FEATURES_DB_PASSWORD}';" | run_sql 'postgres'
-  echo "GRANT ops TO ${FEATURES_DB_USER%@*};" | run_sql 'postgres'
-  echo "GRANT frontend TO ${FEATURES_DB_USER%@*};" | run_sql 'postgres'
+  echo "GRANT ops TO ${username};" | run_sql 'postgres'
+  echo "GRANT frontend TO ${username};" | run_sql 'postgres'
   log "...done, database is now set up"
 
   log "Setting up schema..."
@@ -76,5 +79,5 @@ if ! features_database_exists; then
   log "...done, query planner is now ready"
 fi
 
-FEATURES_CONNECTION_STRING="postgres://frontend:${FEATURES_DB_PASSWORD}@${FEATURES_DB_HOST}:${FEATURES_DB_PORT}/${FEATURES_DB_NAME}?ssl=true" \
+FEATURES_CONNECTION_STRING="postgres://frontend@${hostname}:${FEATURES_DB_PASSWORD}@${FEATURES_DB_HOST}:${FEATURES_DB_PORT}/${FEATURES_DB_NAME}?ssl=true" \
 npm start

services/postgres.js

@@ -4,6 +4,7 @@ const
     HttpStatus = require('http-status-codes'),
     common = require('service-utils'),
     ServiceError = common.utils.ServiceError,
+    config = require('../config'),
     url = require('url');
 
 function init(callback) {
@@ -15,16 +16,14 @@ function init(callback) {
     const query = querystring.parse(params.query);
     const auth = params.auth.split(':');
 
-    const config = {
+    const featureDatabasePool = new pg.Pool({
         user: auth[0],
         password: auth[1],
         host: params.hostname,
         port: params.port,
         ssl: query['ssl'],
         database: params.pathname.split('/')[1]
-    };
-
-    const featureDatabasePool = new pg.Pool(config);
+    });
 
     return callback(null, featureDatabasePool);
 }