hostname now configurable. Cleanup of iris script.

Author: gingi

conf/services-sample.json

@@ -1,4 +1,7 @@
 {
+    "settings" : {
+        "hostname" : "0.0.0.0"
+    },
     "endpoints": {
         "iris" : {
             "examples" : { "paths" : [ "/gwas", "/phenotypes", "/species", "/pcoords" ] }
@@ -12,7 +15,7 @@
         {
             "config": "app-config.js",
             "name": "iris", 
-            "nodefile": "proxy.js", 
+            "nodefile": "proxy.js",
             "port": 4747
         }, 
         {

nodejs/services/service-base.js

@@ -128,13 +128,21 @@ exports.loadConfiguration = function (confFile) {
     }
     if (confFile == null) {
         console.log("Configuration file required!");
-        console.log("Usage: node " + process.argv[1] + " <config_file.js> [<service-name>]");
+        console.log("Usage: node " +
+            process.argv[1] + " <config_file.js> [<service-name>]");
         return;
     }
     IRIS.config = require(confFile).Config;
     if (global.process.env.NODE_PORT != null) {
         IRIS.config.appPort = global.process.env.NODE_PORT;
     }
+    if (!IRIS.config.settings) {
+        IRIS.config.settings = {};
+    }
+    if (!IRIS.config.settings.hostname) {
+        IRIS.config.settings.hostname = '0.0.0.0';
+    }
+    
     return IRIS.config;
 };
 
@@ -170,7 +178,7 @@ exports.findService = function (args) {
 
 exports.startService = function () {
     IRIS.app.listen(IRIS.config.appPort);
-    console.log("service-address http://localhost:%d", IRIS.app.address().port)
+    console.log("service-address %s", IRIS.uri());
     console.log("service-mode %s", IRIS.app.settings.env);
 }
 
@@ -184,7 +192,8 @@ exports.httpGET = function (response, service, path) {
 }
 
 IRIS.uri = function () {
-    return 'http://' + IRIS.app.address().address + ':' + IRIS.app.address().port;
+    return 'http://' +
+        IRIS.app.address().address + ':' + IRIS.app.address().port;
 }
 
 /* SERVICE API
@@ -211,7 +220,8 @@ IRIS.app.get('/service/list', function (req, res) {
             var service = {
                 name: serviceName,
                 path: paths[i],
-                uri: 'http://0.0.0.0:' + endpoint.port
+                uri: 'http://' + IRIS.config.settings.hostname +
+                    ':' + endpoint.port
             };
             services.push(service);            
         }

scripts/iris

@@ -10,20 +10,21 @@ LOGDIR=$IRIS_HOME/logs
 PIDFILE=$LOGDIR/iris.pid
 SVCPIDFILE=$LOGDIR/service.%%.pid
 INSTALL_LOG=$LOGDIR/install.log
-HOSTNAME=http://0.0.0.0
+DEFAULT_HOSTNAME=0.0.0.0
 
 IRIS_USAGE='iris [options] <command> [<arguments>]
     
 Available commands:
+    check       Ensure that Iris is ready to go
+    examples    Install example data
     help        This command
     install     Install dependencies required by Iris
     open        Open up an Iris session (Mac only, for now)
-    start       Start Iris
-    stop        Stop Iris
     restart     Restart Iris
     services    Lists available services
+    start       Start Iris
     status      Check whether or not Iris is running
-    check       Ensure that Iris is ready to go
+    stop        Stop Iris
     
 "iris help <command>" shows help on specific commands.'
 
@@ -55,6 +56,16 @@ function _json_flatten {
     " < $jsonfile
 }
 
+function _json_lookup {
+    jsonfile=$1
+    fields=$2
+    perl -MJSON -e "
+         my \$d = decode_json(join '',<STDIN>);
+         for (qw/$fields/) { \$d = \$d->{\$_} };
+         print \"\$d\n\";
+    " < $jsonfile
+}
+
 function _running_pid {
     pidfile=$1
     if [ -e "$pidfile" ]; then
@@ -80,7 +91,7 @@ function _start_services {
     fi
     echo "Starting services..."
     if [ -n "$svc" ]; then
-        list_services="iris_cmd_services | awk '\$2==\"$svc\"{print}'"
+        list_services="iris_cmd_services $svc"
     else
         list_services='iris_cmd_services'
     fi
@@ -128,10 +139,15 @@ function _status_line {
 
 function _find_service {
     local svc=$1
-    local service=(`iris_cmd_services | awk "\\\$2==\"\$svc\"{print}"`)
+    local service=(`iris_cmd_services $svc`)
     echo "${service[*]}"
 }
 
+function _service_url {
+    local svc=($@)
+    echo "http://${svc[4]}:${svc[0]}"
+}
+
 function _service_status {
     local service=($@)
     local name=${service[1]}
@@ -140,8 +156,7 @@ function _service_status {
         echo "Service '$name' is not running."
         return
     fi
-    local port=${service[0]}
-    _status_line $name `_running_pid $pidfile` "$HOSTNAME:$port"
+    _status_line $name `_running_pid $pidfile` `_service_url ${service[@]}`
 }
 
 # ===========================================================================
@@ -157,7 +172,7 @@ Starts Iris services. With no arguments, starts all services.
 function iris_cmd_start {
     svc=$1
     if [ -n "$svc" ]; then
-        if [ `iris_cmd_services | cut -f2 | grep -c "\b$svc\b"` -eq 0 ]; then
+        if [ -z `iris_cmd_services $svc` ]; then
             echo "Service $svc is not a valid service!"
             exit 1
         fi
@@ -184,7 +199,7 @@ Stops Iris services. With no arguments, stops all of Iris.
 function iris_cmd_stop {
     svc=$1
     if [ -n "$svc" ]; then
-        if [ `iris_cmd_services | cut -f2 | grep -c "\b$svc\b"` -eq 0 ]; then
+        if [ -z `iris_cmd_services $svc` ]; then
             echo "Service $svc is not a valid service!"
             exit 1
         else
@@ -346,8 +361,8 @@ Opens a browser window with the Iris website. This option is currently only
 supported by Mac (Srsly, why would you use anything else?)."
 function iris_cmd_open {
     proxy_service='iris' # TODO: Name it something else?
-    port=`_find_service $proxy_service | awk '{print $1}'`
-    open $HOSTNAME:$port
+    local service=`iris_cmd_services $proxy_service`
+    open `_service_url $service`
 }
 
 # ---------------------------------------------------------------------------
@@ -363,23 +378,24 @@ See also: 'iris services'"
 function iris_cmd_status {
     svc=$1
     if [ -n "$svc" ]; then
-        local service=(`_find_service $svc`)
-        if [ "${#service[@]}" -eq 0 ]; then
+        local service=`iris_cmd_services $svc`
+        if [ -z "$service" ]; then
             echo "Service '$svc' is not a valid service!"
             iris_cmd_help status 
         fi
         _status_line "SERVICE" "PID" "URL"
-        _service_status ${service[@]}
+        _service_status $service
     else
         pid=`_iris_pid`
         if [ -z "$pid" ]; then
             echo "Iris is not running."
         else
             echo "Iris is running as process $pid with the following services:"
         fi
-        iris_cmd_services | cut -f2 | while read name; do
-            local service=(`_find_service $name`)
-            local pid=$(_running_pid $(_svc_pidfile $name))
+        iris_cmd_services | while read line
+        do
+            local service=($line)
+            local pid=$(_running_pid $(_svc_pidfile ${service[1]}))
             if [ -n "$pid" ]; then
                 if [ -z "$service_running" ]; then
                     _status_line "SERVICE" "PID" "URL"
@@ -394,13 +410,34 @@ function iris_cmd_status {
 # ---------------------------------------------------------------------------
 # IRIS SERVICES
 # ---------------------------------------------------------------------------
-_help_services="iris services
+_help_services="iris services [<service>]
 
 Lists available service currently configured with Iris (not *running* services).
 
+    <service>   Only show configuration for specified service
+
 See also: 'iris status'"
 function iris_cmd_services {
-    _json_flatten $SVC_CONF "services" "port name nodefile config"
+    local name=$1
+    local hostname=$(_json_lookup $SVC_CONF "settings hostname")
+    [ -z "$hostname" ] && hostname=DEFAULT_HOSTNAME
+    local services
+    if [ -n "$name" ]; then
+         services=$(_json_flatten $SVC_CONF services \
+             'port name nodefile config hostname' | awk "\$2 == \"$name\"")
+    else
+         services=$(_json_flatten $SVC_CONF services \
+             'port name nodefile config hostname')
+    fi
+    
+    [ -z "$services" ] && return
+    echo "$services" | while read line; do
+        local svc=($line)
+        if [ -z "${svc[4]}" ]; then
+            svc[4]=$hostname
+        fi
+        printf "%-5d %-18s %-20s %-25s %s\n" ${svc[@]}
+    done
 }
 
 # ---------------------------------------------------------------------------
@@ -420,7 +457,7 @@ function iris_cmd_restart {
 # ---------------------------------------------------------------------------
 # IRIS EXAMPLES
 # ---------------------------------------------------------------------------
-_help_check="iris examples
+_help_examples="iris examples
 
 Install example data."
 function iris_cmd_examples {