couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject svn commit: r829432 - in /couchdb/trunk/src/couchdb: couch_os_process.erl couch_server_sup.erl
Date Sat, 24 Oct 2009 18:53:58 GMT
Author: kocolosk
Date: Sat Oct 24 18:53:57 2009
New Revision: 829432

URL: http://svn.apache.org/viewvc?rev=829432&view=rev
Log:
use couch_util:priv_dir() b/c it works in dev mode too

Modified:
    couchdb/trunk/src/couchdb/couch_os_process.erl
    couchdb/trunk/src/couchdb/couch_server_sup.erl

Modified: couchdb/trunk/src/couchdb/couch_os_process.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_os_process.erl?rev=829432&r1=829431&r2=829432&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_os_process.erl (original)
+++ couchdb/trunk/src/couchdb/couch_os_process.erl Sat Oct 24 18:53:57 2009
@@ -103,13 +103,7 @@
 
 % gen_server API
 init([Command, Options, PortOptions]) ->
-    case code:priv_dir(couch) of
-    {error, bad_name} ->
-        % small hack, in dev mode "app" is couchdb. Fixing requires renaming
-        % src/couch to src/couch. Not really worth the hassle.-Damien
-        PrivDir = code:priv_dir(couchdb);
-    PrivDir -> ok
-    end,
+    PrivDir = couch_util:priv_dir(),
     Spawnkiller = filename:join(PrivDir, "couchspawnkillable"),
     BaseProc = #os_proc{
         command=Command,

Modified: couchdb/trunk/src/couchdb/couch_server_sup.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_server_sup.erl?rev=829432&r1=829431&r2=829432&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_server_sup.erl (original)
+++ couchdb/trunk/src/couchdb/couch_server_sup.erl Sat Oct 24 18:53:57 2009
@@ -76,7 +76,7 @@
     LibDir =
     case couch_config:get("couchdb", "util_driver_dir", null) of
     null ->
-        filename:join(code:priv_dir(couch), "lib");
+        filename:join(couch_util:priv_dir(), "lib");
     LibDir0 -> LibDir0
     end,
 



Mime
View raw message