Restored subprocess.Popen [skip hazardlib] [demos]

bin/run-demos.sh

@@ -3,8 +3,8 @@ set -e
 # run demos with job_hazard.ini and job_risk.ini
 for demo_dir in $(find "$1" -type d | sort); do
    if [ -f $demo_dir/job_hazard.ini ]; then
-       python -m openquake.commands engine --run $demo_dir/job_hazard.ini
-       python -m openquake.commands engine --run $demo_dir/job_risk.ini --hc -1
+       oq engine --run $demo_dir/job_hazard.ini
+       oq engine --run $demo_dir/job_risk.ini --hc -1
    fi
 done
 # run the other demos
@@ -14,23 +14,23 @@ if [ ! -d "$1" ]; then
 fi
 
 for ini in $(find $1 -name job.ini | sort); do
-    python -m openquake.commands engine --run $ini
+    oq engine --run $ini
 done
 
 # do something with the generated data; -2 is LogicTreeCase3ClassicalPSHA
-python -m openquake.commands extract -2 hazard/rlzs
-python -m openquake.commands engine --lhc
-MPLBACKEND=Agg python -m openquake.commands plot -2
-MPLBACKEND=Agg python -m openquake.commands plot_uhs -2
-MPLBACKEND=Agg python -m openquake.commands plot_sites -2
+oq extract -2 hazard/rlzs
+oq engine --lhc
+MPLBACKEND=Agg oq plot -2
+MPLBACKEND=Agg oq plot_uhs -2
+MPLBACKEND=Agg oq plot_sites -2
 
 # fake a wrong calculation still in executing status (AreaSource)
-python -m openquake.commands db set_status 26 executing
+oq db set_status 26 executing
 # repeat the failed/executing calculation, which is useful for QGIS
-python -m openquake.commands engine --run $1/hazard/AreaSourceClassicalPSHA/job.ini
+oq engine --run $1/hazard/AreaSourceClassicalPSHA/job.ini
 
 # display the calculations
-python -m openquake.commands db find %
+oq db find %
 
 # build an HTML report
-python -m openquake.commands engine --make-html-report today
+oq engine --make-html-report today

openquake/server/dbserver.py

@@ -22,7 +22,7 @@
 import sqlite3
 import logging
 import threading
-import multiprocessing
+import subprocess
 
 from openquake.baselib import config, sap, zeromq as z, workerpool as w
 from openquake.baselib.general import socket_ready
@@ -159,8 +159,12 @@ def ensure_on():
         if config.dbserver.multi_user:
             sys.exit('Please start the DbServer: '
                      'see the documentation for details')
-        # otherwise start the DbServer automatically
-        multiprocessing.Process(target=run_server).start()
+        # otherwise start the DbServer automatically; NB: I tried to use
+        # multiprocessing.Process(target=run_server).start() and apparently
+        # it works, but then run-demos.sh hangs after the end of the first
+        # calculation, but only if the DbServer is started by oq engine (!?)
+        subprocess.Popen([sys.executable, '-m', 'openquake.server.dbserver',
+                          '-l', 'INFO'])
 
         # wait for the dbserver to start
         waiting_seconds = 10