summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Vatamaniuc <vatamane@apache.org>2019-01-08 15:17:06 -0500
committerNick Vatamaniuc <vatamane@apache.org>2019-01-08 15:17:06 -0500
commit429864b84c1582f216eefcdee3a773f8f212b952 (patch)
tree3daf8b124130fe47210421d692836b038081695e
parent72b788e8a47baddf73e7bedf9eee1a1d86c9eca3 (diff)
downloadcouchdb-fix-replication-end-time.tar.gz
Fix end_time field in /_replicate responsefix-replication-end-time
Previously `end_time` was generated converting the start_time to universal, then passing that to `httpd_util:rfc1123_date/1`. However, `rfc1123_date/1` also transates its argument from local to UTC time, that is it accepts input to be in local time format. Fixes #1841
-rw-r--r--src/couch_replicator/src/couch_replicator_scheduler_job.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/couch_replicator/src/couch_replicator_scheduler_job.erl b/src/couch_replicator/src/couch_replicator_scheduler_job.erl
index f669d464d..412ff7d05 100644
--- a/src/couch_replicator/src/couch_replicator_scheduler_job.erl
+++ b/src/couch_replicator/src/couch_replicator_scheduler_job.erl
@@ -735,8 +735,8 @@ do_checkpoint(State) ->
{SrcInstanceStartTime, TgtInstanceStartTime} ->
couch_log:notice("recording a checkpoint for `~s` -> `~s` at source update_seq ~p",
[SourceName, TargetName, NewSeq]),
- UniversalStartTime = calendar:now_to_universal_time(ReplicationStartTime),
- StartTime = ?l2b(httpd_util:rfc1123_date(UniversalStartTime)),
+ LocalStartTime = calendar:now_to_local_time(ReplicationStartTime),
+ StartTime = ?l2b(httpd_util:rfc1123_date(LocalStartTime)),
EndTime = ?l2b(httpd_util:rfc1123_date()),
NewHistoryEntry = {[
{<<"session_id">>, SessionId},