couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r687154 - in /incubator/couchdb/branches/runtimeconfig: etc/couchdb/Makefile.am etc/couchdb/local.ini src/couchdb/couch_db_update_notifier_sup.erl
Date Tue, 19 Aug 2008 20:58:56 GMT
Author: damien
Date: Tue Aug 19 13:58:55 2008
New Revision: 687154

URL: http://svn.apache.org/viewvc?rev=687154&view=rev
Log:
Changed how update notifiers are handled in the ini, and added more comments to the local.ini
file that gets added to the installation.

Added:
    incubator/couchdb/branches/runtimeconfig/etc/couchdb/local.ini
Modified:
    incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am
    incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_db_update_notifier_sup.erl

Modified: incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am?rev=687154&r1=687153&r2=687154&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am Tue Aug 19 13:58:55 2008
@@ -31,7 +31,7 @@
 
 install-data-hook:
 	if test ! -f "$(localconfdir)/local.ini"; then \
-	    echo "; Use this file for your local configuration." > $(localconfdir)/local.ini;
\
+	    cp local.ini $(localconfdir)/local.ini; \
 	fi
 
 uninstall-local:

Added: incubator/couchdb/branches/runtimeconfig/etc/couchdb/local.ini
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/couchdb/local.ini?rev=687154&view=auto
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/couchdb/local.ini (added)
+++ incubator/couchdb/branches/runtimeconfig/etc/couchdb/local.ini Tue Aug 19 13:58:55 2008
@@ -0,0 +1,20 @@
+; CouchDB Configuration Settings
+
+; Custom settings should be made in this file. They will override settings
+; in default.ini, but unlike changes made to default.ini, this file won't be
+; overwritten on server upgrade.
+
+[CouchDB]
+;MaximumDocumentSize=4294967296 ; bytes
+
+[HTTPd]
+;Port=5984
+;BindAddress=127.0.0.1
+
+[Log]
+;Level=info
+
+[Update Notification]
+;unique notifier name=/full/path/to/exe -with "cmd line arg"
+
+

Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_db_update_notifier_sup.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_db_update_notifier_sup.erl?rev=687154&r1=687153&r2=687154&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_db_update_notifier_sup.erl
(original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_db_update_notifier_sup.erl
Tue Aug 19 13:58:55 2008
@@ -31,16 +31,17 @@
 init([]) ->
     Self = self(),
     ok = couch_config:register(
-        fun({"CouchDB", "DbUpdateNotificationProcess"}) ->
+        fun({"Update Notification", _}) ->
             exit(Self, reload_config)
         end),
+    
     UpdateNotifierExes = couch_config:lookup_match(
-            {{"Update Notification", ""}, '$1'}, []),
+            {{"Update Notification", '$1'}, '$2'}, []),
 
     {ok,
         {{one_for_one, 10, 3600}, 
-            lists:map(fun({UpdateNotifierExe}) ->
-                {UpdateNotifierExe,
+            lists:map(fun({Name, UpdateNotifierExe}) ->
+                {Name,
                 {couch_db_update_notifier, start_link, [UpdateNotifierExe]},
                     permanent,
                     1000,



Mime
View raw message