~ubuntu-branches/ubuntu/lucid/couchdb/lucid

« back to all changes in this revision

Viewing changes to src/couchdb/couch_external_server.erl

  • Committer: Bazaar Package Importer
  • Author(s): Chad Miller, Ken VanDine
  • Date: 2009-09-25 19:18:26 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20090925191826-km9018omfgxosvah
Tags: 0.10.0~svn818859-0ubuntu1
* Import code from pre-release branch.  (LP: #427860, #408909)
        + Build and System Integration:
          * Changed `couchdb` script configuration options.
          * Added default.d and local.d configuration directories to load
      sequence.
        + HTTP Interface:
          * Added optional cookie-based authentication handler.
          * Added optional two-legged OAuth authentication handler.
* Packaging of couchdb-bin must replace pre-split couchdb.
  (LP: #432219)
* Move all of /etc and /var out of the couchdb-bin package, to the
  couchdb package. 
* /etc/couchdb must be in couchdb-bin, as config files are needed
  by all servers.
  + So the couchdb user must be managed by couchdb-bin.
  + Split postinst/postrm files to manage different files.
  + Set Replaces of couchdb-bin by couchdb so that config files
    migrate.
* Update the version number in postrm.  (!)
* Use the new "Breaks" field in control file to help split pkg.

[Ken VanDine]
* debian/couchdb.install:
  - removed /var
* debian/rules:
  - removed bootstrap 
* debian/couchdb.postinst:
  - Added the debhelper tag

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
init([Name, Command]) ->
35
35
    ?LOG_INFO("EXTERNAL: Starting process for: ~s", [Name]),
36
36
    ?LOG_INFO("COMMAND: ~s", [Command]),
37
 
    {ok, Pid} = couch_os_process:start_link(Command),
 
37
    Timeout = list_to_integer(couch_config:get("couchdb", "os_process_timeout",
 
38
        "5000")),
 
39
    {ok, Pid} = couch_os_process:start_link(Command, [{timeout, Timeout}]),
 
40
    couch_config:register(fun("couchdb", "os_process_timeout", NewTimeout) ->
 
41
        couch_os_process:set_timeout(Pid, list_to_integer(NewTimeout))
 
42
    end),
38
43
    {ok, {Name, Command, Pid}}.
39
44
 
40
45
terminate(_Reason, {_Name, _Command, Pid}) ->