Mailing-List: contact couchdb-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: couchdb-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r656580 - in /incubator/couchdb/branches/runtimeconfig:
 README
 bin/couchdb.tpl.in bootstrap configure.ac src/couchdb/couch_server_sup.erl
Date: Thu, 15 May 2008 09:50:25 -0000
To: couchdb-commits@incubator.apache.org
From: nslater@apache.org
Message-Id: <20080515095026.0BDA12388A59@eris.apache.org>

Author: nslater
Date: Thu May 15 02:50:25 2008
New Revision: 656580

URL: http://svn.apache.org/viewvc?rev=656580&view=rev
Log:
(hopefully) improved the startup message, changed existing messages for consistency

Modified:
    incubator/couchdb/branches/runtimeconfig/README
    incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in
    incubator/couchdb/branches/runtimeconfig/bootstrap
    incubator/couchdb/branches/runtimeconfig/configure.ac
    incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_server_sup.erl

Modified: incubator/couchdb/branches/runtimeconfig/README
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/README?rev=656580&r1=656579&r2=656580&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/README (original)
+++ incubator/couchdb/branches/runtimeconfig/README Thu May 15 02:50:25 2008
@@ -100,7 +100,7 @@
 
 If everything was successful you should see the following message:
 
-    You have configured Apache CouchDB. Time to relax.
+    You have configured Apache CouchDB, time to relax.
 
 Relax.
 
@@ -154,7 +154,7 @@
 
 When Apache CouchDB starts it should eventually display the following message:
 
-    Apache CouchDB has started. Time to relax.
+    Apache CouchDB has started, time to relax. See http://localhost:5984/_utils/index.html
 
 Relax.
 

Modified: incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in?rev=656580&r1=656579&r2=656580&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in (original)
+++ incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in Thu May 15 02:50:25 2008
@@ -131,7 +131,7 @@
     PID=$(_get_pid)
     if test -n "$PID"; then
         if kill -0 $PID 2> /dev/null; then
-            echo "Apache CouchDB is running as process $PID. Time to relax."
+            echo "Apache CouchDB is running as process $PID, time to relax."
             return $SCRIPT_OK
         else
             echo >&2 << EOF
@@ -220,9 +220,9 @@
         touch $PID_FILE
         interactive_option="+Bd -noinput"
     fi
-    
+
     ini_file_list="[\\\"$INI_FILE\\\"]"
-    
+
     command="`%ICU_CONFIG% --invoke` \
         %ERL% $interactive_option -sasl errlog_type error \
         -pa %erlanglibdir%/couch-%version%/ebin \
@@ -239,7 +239,7 @@
         # Recursively call and detach a duplicate couchdb command.
         $0 -c $INI_FILE -b -r $RESPAWN_TIMEOUT -p $PID_FILE \
             -o $STDOUT_FILE -e $STDERR_FILE -R &
-        echo "Apache CouchDB has started. Time to relax."
+        echo "Apache CouchDB has started, time to relax."
     else
         if test "$RECURSED_BOOLEAN" = "true"; then
             while true; do

Modified: incubator/couchdb/branches/runtimeconfig/bootstrap
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/bootstrap?rev=656580&r1=656579&r2=656580&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/bootstrap (original)
+++ incubator/couchdb/branches/runtimeconfig/bootstrap Thu May 15 02:50:25 2008
@@ -281,7 +281,7 @@
     run_autoconf
     cat << EOF
 
-You have bootstrapped Apache CouchDB. Time to relax.
+You have bootstrapped Apache CouchDB, time to relax.
 
 Run \`./configure' to configure the source before you install.
 EOF

Modified: incubator/couchdb/branches/runtimeconfig/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/configure.ac?rev=656580&r1=656579&r2=656580&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/configure.ac (original)
+++ incubator/couchdb/branches/runtimeconfig/configure.ac Thu May 15 02:50:25 2008
@@ -235,6 +235,6 @@
 AC_OUTPUT
 
 echo
-echo "You have configured Apache CouchDB. Time to relax."
+echo "You have configured Apache CouchDB, time to relax."
 echo
 echo "Run \`make && make install' to install."

Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_server_sup.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_server_sup.erl?rev=656580&r1=656579&r2=656580&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_server_sup.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_server_sup.erl Thu May 15 02:50:25 2008
@@ -109,11 +109,11 @@
                 [couch_ft_query]}]
         end,
 
-    io:format("~s~n~n", [ConsoleStartupMsg]),
-    
-    
+    io:format("~s~n", [ConsoleStartupMsg]),
+
+
     couch_util:start_driver(),
-    
+
     % ensure these applications are running
     application:start(inets),
     application:start(crypto),
@@ -125,8 +125,8 @@
     case StartResult of
     {ok,_} ->
         % only output when startup was successful
-        io:format("Find Futon, the management interface, at:~nhttp://~s:~s/_utils/index.html~n~n", [couch_config:lookup({"HTTPd", "BindAddress"}), couch_config:lookup({"HTTPd", "Port"})]),
-        io:format("Apache CouchDB has started. Time to relax.~n");
+        io:format("Apache CouchDB has started, time to relax. See http://~s:~s/_utils/index.html~n",
+            [couch_config:lookup({"HTTPd", "BindAddress"}), couch_config:lookup({"HTTPd", "Port"})]);
     _ ->
         % Since we failed startup, unconditionally dump configuration data to console
         ok = couch_config:dump()
@@ -168,4 +168,4 @@
 %     %            couch_config:lookup({log, level}),
 %     %            couch_config:lookup({fulltext, query_server}),
 %     %            [lists:flatten(io_lib:format("\t~s=~s~n", [Lang, QueryExe])) || {Lang, QueryExe} <- couch_config:lookup({couchdb, view_query_servers})]]),
-%     %            ?LOG_INFO("~s", [ConfigInfo]).
\ No newline at end of file
+%     %            ?LOG_INFO("~s", [ConfigInfo]).