couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r743801 - in /couchdb/trunk: etc/couchdb/local_dev.ini src/couchdb/couch_rep.erl
Date Thu, 12 Feb 2009 16:48:01 GMT
Author: damien
Date: Thu Feb 12 16:48:01 2009
New Revision: 743801

URL: http://svn.apache.org/viewvc?rev=743801&view=rev
Log:
Fix for spurious 'server restarted' during replication

Modified:
    couchdb/trunk/etc/couchdb/local_dev.ini
    couchdb/trunk/src/couchdb/couch_rep.erl

Modified: couchdb/trunk/etc/couchdb/local_dev.ini
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/local_dev.ini?rev=743801&r1=743800&r2=743801&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/local_dev.ini (original)
+++ couchdb/trunk/etc/couchdb/local_dev.ini Thu Feb 12 16:48:01 2009
@@ -12,7 +12,7 @@
 ;bind_address = 127.0.0.1
 
 [log]
-level = error
+level = info
 
 [update_notification]
 ;unique notifier name=/full/path/to/exe -with "cmd line arg"

Modified: couchdb/trunk/src/couchdb/couch_rep.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep.erl?rev=743801&r1=743800&r2=743801&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_rep.erl (original)
+++ couchdb/trunk/src/couchdb/couch_rep.erl Thu Feb 12 16:48:01 2009
@@ -71,8 +71,11 @@
     
     ReplicationStartTime = httpd_util:rfc1123_date(),
     
-    {ok, SrcInstanceStartTime} = get_db_info(DbSrc),
-    {ok, TgtInstanceStartTime} = get_db_info(DbTgt),
+    {ok, InfoSrc} = get_db_info(DbSrc),
+    {ok, InfoTgt} = get_db_info(DbTgt),
+    
+    SrcInstanceStartTime = proplists:get_value(instance_start_time, InfoSrc),
+    TgtInstanceStartTime = proplists:get_value(instance_start_time, InfoTgt),
     
     case proplists:get_value(full, Options, false)
         orelse proplists:get_value("full", Options, false) of



Mime
View raw message