diff options
| author | Damien F. Katz <damien@apache.org> | 2009-02-12 16:48:01 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2009-02-12 16:48:01 +0000 |
| commit | 604fd8f4bb95fbf9cb42ff33e094db3ba1f690ab (patch) | |
| tree | b67167b2075bebf97fa819f4569cdb657432b39e | |
| parent | d3696668cfa93a69e55ff8717b7990f49e740b06 (diff) | |
Fix for spurious 'server restarted' during replication
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@743801 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | etc/couchdb/local_dev.ini | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_rep.erl | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/etc/couchdb/local_dev.ini b/etc/couchdb/local_dev.ini index 09123cf7..b0f1f26d 100644 --- a/etc/couchdb/local_dev.ini +++ b/etc/couchdb/local_dev.ini @@ -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" diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl index ff926584..0e7c1012 100644 --- a/src/couchdb/couch_rep.erl +++ b/src/couchdb/couch_rep.erl @@ -71,8 +71,11 @@ replicate2(Source, DbSrc, Target, DbTgt, Options) -> 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 |