diff options
| author | Jérémy Bethmont <jeremy.bethmont@gmail.com> | 2017-11-15 21:39:18 +0700 |
|---|---|---|
| committer | Joan Touzet <wohali@users.noreply.github.com> | 2018-03-26 19:16:51 -0400 |
| commit | 43916a45834581ad39f4e57c413f086413d8a554 (patch) | |
| tree | 4facca712d5307ba7058922942b2c30843a214b9 | |
| parent | f1545b979de47e6e4484b85e6e6b40b396cfd934 (diff) | |
| download | couchdb-1.7.x.tar.gz | |
Allow couchspawnkillable to live in directories with spacesarchive/1.7.x1.7.x
| -rw-r--r-- | src/couchdb/couch_os_daemons.erl | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_os_process.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_os_daemons.erl b/src/couchdb/couch_os_daemons.erl index cac031a9b..ebfd6571f 100644 --- a/src/couchdb/couch_os_daemons.erl +++ b/src/couchdb/couch_os_daemons.erl @@ -197,7 +197,7 @@ start_port(Command) -> start_port(Command, EnvPairs) -> PrivDir = couch_util:priv_dir(), - Spawnkiller = filename:join(PrivDir, "couchspawnkillable"), + Spawnkiller = "\"" ++ filename:join(PrivDir, "couchspawnkillable") ++ "\"", Opts = case lists:keytake(env, 1, ?PORT_OPTIONS) of false -> ?PORT_OPTIONS ++ [ {env,EnvPairs} ]; diff --git a/src/couchdb/couch_os_process.erl b/src/couchdb/couch_os_process.erl index db62d499e..8ccf80bbb 100644 --- a/src/couchdb/couch_os_process.erl +++ b/src/couchdb/couch_os_process.erl @@ -142,7 +142,7 @@ pick_command1(_) -> % gen_server API init([Command, Options, PortOptions]) -> PrivDir = couch_util:priv_dir(), - Spawnkiller = filename:join(PrivDir, "couchspawnkillable"), + Spawnkiller = "\"" ++ filename:join(PrivDir, "couchspawnkillable") ++ "\"", BaseProc = #os_proc{ command=Command, port=open_port({spawn, Spawnkiller ++ " " ++ Command}, PortOptions), |