removing shared options from vassals

1 files changed, 10 insertions, 14 deletions

diff --git a/taler-bank-manage.in b/taler-bank-manage.in
index b6b7758..2caa6d3 100644
--- a/taler-bank-manage.in
+++ b/taler-bank-manage.in
@@ -45,7 +45,10 @@ def handle_serve_http(args):
         port = tc["bank"]["http_port"].value_int(required=True)
     httpspec = ":%d" % (port,)
     os.execlp("uwsgi", "uwsgi",
-            "--emperor", "@prefix@/share/taler-bank/vassals")
+            "--master",
+            "--die-on-term",
+            "--log-format", uwsgi_logfmt,
+            "--emperor", "@prefix@/share/taler-bank/vassals-http")
 
 # FIXME Emperor to be called
 def handle_serve_uwsgi(args):
@@ -60,18 +63,12 @@ def handle_serve_uwsgi(args):
     params = ["uwsgi", "uwsgi",
         "--master",
         "--die-on-term",
-        "--log-format", uwsgi_logfmt,
-        "--wsgi-file", "@prefix@/share/taler-bank/bank.wsgi"]
-    if serve_uwsgi == "tcp": # is that check right?
-        port = tc["bank"]["uwsgi_port"].value_int(required=True)
-        spec = ":%d" % (port,)
-        params.extend(["--socket", spec])
-    elif serve_uwsgi == "unix":
-        spec = tc["bank"]["uwsgi_unixpath"].value_filename(required=True)
-        mode = tc["bank"]["uwsgi_unixpath_mode"].value_filename(required=True)
-        params.extend(["--socket", spec])
-        params.extend(["--chmod-socket="+mode])
-        os.makedirs(os.path.dirname(spec), exist_ok=True)
+        "--log-format", uwsgi_logfmt]
+    if "tcp" == serve_uwsgi:
+        params.extend(["--emperor", "@prefix@/share/taler-bank/vassals-http"])
+    else
+        params.extend(["--emperor", "@prefix@/share/taler-bank/vassals-unix"])
+
     logging.info("launching uwsgi with argv %s", params[1:])
     os.execlp(*params)
 
@@ -101,7 +98,6 @@ p = sub.add_parser('sampledata', help="Put sample data into the db")
 p.set_defaults(func=handle_sampledata)
 
 p = sub.add_parser('serve-http', help="Serve bank over HTTP")
-p.add_argument("--port", "-p", dest="port", type=int, default=None, metavar="PORT")
 p.set_defaults(func=handle_serve_http)
 
 p = sub.add_parser('serve-uwsgi', help="Serve bank over UWSGI")